Skip to content

Commit

Permalink
Removed dead symbolic link/ added python module to install.
Browse files Browse the repository at this point in the history
  • Loading branch information
jgoppert committed Apr 19, 2012
1 parent 30d289e commit f722ca8
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 13 deletions.
20 changes: 8 additions & 12 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,15 @@ endif()

# install files
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/ DESTINATION include/${PROJECT_NAME} COMPONENT Dev FILES_MATCHING PATTERN "*.h")

# install files
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/src/ DESTINATION share/${PROJECT_NAME} COMPONENT Dev FILES_MATCHING PATTERN "*.c*")
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/pymavlink
DESTINATION "share/pyshared" COMPONENT Dev
)
configure_file(pc.in ${PROJECT_NAME}.pc)
install(FILES
${PROJECT_BINARY_DIR}/${PROJECT_NAME}.pc
DESTINATION "lib/pkgconfig" COMPONENT Dev
)

### packaging

Expand Down Expand Up @@ -199,15 +205,5 @@ set(CPACK_SET_DESTDIR TRUE)
set(CPACK_COMPONENTS_GROUPING "ALL_COMPONENTS_IN_ONE")
include(CPack)

# src files
install(DIRECTORY src
DESTINATION "share/mavlink" COMPONENT Dev
)

# pkgconfig
configure_file(pc.in ${PROJECT_NAME}.pc)
install(FILES
${PROJECT_BINARY_DIR}/${PROJECT_NAME}.pc
DESTINATION "lib/pkgconfig" COMPONENT Dev
)
# vim:sw=4:ts=4:expandtab
1 change: 0 additions & 1 deletion pymavlink/APM_Mavtest/mavtest.h

This file was deleted.

0 comments on commit f722ca8

Please sign in to comment.