From 8fd3004cef1b9875da489050e5958e74872ad512 Mon Sep 17 00:00:00 2001 From: Achmad Fathoni Date: Mon, 19 Apr 2021 13:10:49 +0700 Subject: [PATCH 1/3] Add install target to CMakeLists.txt --- CMakeLists.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ed2c9f..6282c87 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -121,4 +121,11 @@ if(BUILD_test) add_dependencies(gicp_test fast_gicp) target_link_libraries(gicp_test ${GTEST_LIBRARIES} ${PCL_LIBRARIES} fast_gicp) gtest_add_tests(TARGET gicp_test WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} EXTRA_ARGS "${CMAKE_SOURCE_DIR}/data") -endif() \ No newline at end of file +endif() + +install(TARGETS ${PROJECT_NAME} + LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}) + +install(DIRECTORY include/ + DESTINATION ${CATKIN_GLOBAL_INCLUDE_DESTINATION} + FILES_MATCHING PATTERN "*.hpp") \ No newline at end of file From 0dc7d3fb3db303c9c66160e18236db657de66820 Mon Sep 17 00:00:00 2001 From: Achmad Fathoni Date: Tue, 20 Apr 2021 22:06:23 +0700 Subject: [PATCH 2/3] Add fast_vgicp_cuda install target --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6282c87..1bf16b0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -111,6 +111,8 @@ if(BUILD_VGICP_CUDA) fast_vgicp_cuda ) add_dependencies(fast_gicp fast_vgicp_cuda) + install(TARGETS fast_vgicp_cuda + LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}) endif() ### TEST ### From 6e91144641acb23c40089f4db929c7c820365cde Mon Sep 17 00:00:00 2001 From: Achmad Fathoni Date: Thu, 20 May 2021 02:40:00 +0700 Subject: [PATCH 3/3] Check if catkin_exist before install --- CMakeLists.txt | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1bf16b0..8de2327 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -111,8 +111,10 @@ if(BUILD_VGICP_CUDA) fast_vgicp_cuda ) add_dependencies(fast_gicp fast_vgicp_cuda) - install(TARGETS fast_vgicp_cuda - LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}) + if(catkin_FOUND) + install(TARGETS fast_vgicp_cuda + LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}) + endif() endif() ### TEST ### @@ -125,9 +127,11 @@ if(BUILD_test) gtest_add_tests(TARGET gicp_test WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} EXTRA_ARGS "${CMAKE_SOURCE_DIR}/data") endif() -install(TARGETS ${PROJECT_NAME} - LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}) - -install(DIRECTORY include/ - DESTINATION ${CATKIN_GLOBAL_INCLUDE_DESTINATION} - FILES_MATCHING PATTERN "*.hpp") \ No newline at end of file +if(catkin_FOUND) + install(TARGETS ${PROJECT_NAME} + LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}) + + install(DIRECTORY include/ + DESTINATION ${CATKIN_GLOBAL_INCLUDE_DESTINATION} + FILES_MATCHING PATTERN "*.hpp") +endif()