Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactoring RTABMapConfig.cmake with targets #904

Merged
merged 12 commits into from
Feb 13, 2023
Prev Previous commit
Next Next commit
Fixed nsis error (also fixed unspecified components)
  • Loading branch information
matlabbe committed Feb 13, 2023
commit c78b06f8709f37ab2b80edfdd565a336adbd0de8
12 changes: 8 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -905,7 +905,7 @@ ELSE()
FILES
"${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/FindK4A.cmake"
DESTINATION ${INSTALL_CMAKE_DIR}/Modules/.
COMPONENT Devel
COMPONENT devel
)
ENDIF(WIN32)
ENDIF()
Expand Down Expand Up @@ -940,7 +940,7 @@ ELSE()
FILES
"${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/FindRealSense2.cmake"
DESTINATION ${INSTALL_CMAKE_DIR}/Modules/.
COMPONENT Devel
COMPONENT devel
)
ENDIF(WIN32)
ENDIF()
Expand Down Expand Up @@ -1073,6 +1073,8 @@ install(EXPORT rtabmapTargets
${PROJECT_NAME}Targets.cmake
DESTINATION
${INSTALL_CMAKE_DIR}
COMPONENT
devel
)

####
Expand Down Expand Up @@ -1107,18 +1109,19 @@ install(
DESTINATION
${INSTALL_CMAKE_DIR}
COMPONENT
Devel
devel
)

####

### Install package.xml for catkin
install(FILES package.xml DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_PREFIX}")
install(FILES package.xml DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_PREFIX}" COMPONENT devel)

#######################
# CPACK (Packaging)
#######################
IF(BUILD_AS_BUNDLE)
SET(CMAKE_INSTALL_SYSTEM_RUNTIME_COMPONENT runtime)
INCLUDE(InstallRequiredSystemLibraries)
ENDIF(BUILD_AS_BUNDLE)

Expand All @@ -1135,6 +1138,7 @@ SET(CPACK_PACKAGE_VERSION_PATCH "${PROJECT_VERSION_PATCH}")
#SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
SET(CPACK_PACKAGE_CONTACT "[email protected]")


set(CPACK_SOURCE_IGNORE_FILES
"\\\\.svn/"
"\\\\.settings/"
Expand Down
4 changes: 3 additions & 1 deletion corelib/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -800,7 +800,7 @@ install(
DESTINATION
${INSTALL_INCLUDE_DIR}
COMPONENT
Devel
devel
FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp"
)

Expand All @@ -813,5 +813,7 @@ install(EXPORT rtabmap_coreTargets
${PROJECT_NAME}_coreTargets.cmake
DESTINATION
${INSTALL_CMAKE_DIR}
COMPONENT
devel
)

4 changes: 3 additions & 1 deletion guilib/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ install(
DESTINATION
${INSTALL_INCLUDE_DIR}
COMPONENT
Devel
devel
FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp"
)
export(EXPORT rtabmap_guiTargets
Expand All @@ -237,4 +237,6 @@ install(EXPORT rtabmap_guiTargets
${PROJECT_NAME}_guiTargets.cmake
DESTINATION
${INSTALL_CMAKE_DIR}
COMPONENT
devel
)
2 changes: 2 additions & 0 deletions utilite/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,6 @@ install(EXPORT rtabmap_utiliteTargets
${PROJECT_NAME}_utiliteTargets.cmake
DESTINATION
${INSTALL_CMAKE_DIR}
COMPONENT
devel
)