From b4943162b970257ad620ec41bff62b94bd2193e2 Mon Sep 17 00:00:00 2001 From: Petingo Date: Wed, 21 Jun 2023 12:26:27 +0200 Subject: [PATCH] Fix: cmake dependencies [no ci] --- CMakeLists.txt | 2 ++ cmake/dependencies.cmake | 5 ++++- src/CMakeLists.txt | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 26e023be..2ed3022b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,6 +48,8 @@ if(BUILD_UTILS) add_subdirectory(utils) endif() +# install CGAL +install(DIRECTORY 3rdparty/CGAL/include/CGAL DESTINATION include) #------------------------------------------------------------------------------------------------------------ # Uninstall target, for "make uninstall" diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake index 14885c3c..8aeb3462 100644 --- a/cmake/dependencies.cmake +++ b/cmake/dependencies.cmake @@ -87,8 +87,11 @@ else() set(CGAL_INCLUDE_DIR "3rdparty/CGAL/include") endif() include_directories( ${CGAL_INCLUDE_DIR} ) +# add_library(CGAL INTERFACE) +# target_include_directories(CGAL INTERFACE 3rdparty/CGAL/include) +# set (TSLAM_REQUIRED_LIBRARIES ${TSLAM_REQUIRED_LIBRARIES} CGAL) -if(NOT USE_OWN_CGAL) +if(NOT USE_OWN_CILANTRO) find_package( cilantro REQUIRED ) else() set(CILANTRO_INCLUDE_DIR "3rdparty/cilantro/include") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e04b907f..c74f383e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -56,5 +56,5 @@ install(FILES ${tslam_hdrs_base} COMPONENT main) install(FILES ${tslam_map_hdr} DESTINATION include/${PROJECT_NAME}/map_types COMPONENT main) -install(FILES ${tslam_basictypes_hdr} DESTINATION include/${PROJECT_NAME}/basictypes COMPONENT main) - +install(FILES ${tslam_basictypes_hdr} DESTINATION include/${PROJECT_NAME}/basictypes COMPONENT main) +install(FILES ${tslam_reconstruction_hdr} DESTINATION include/${PROJECT_NAME}/reconstruction COMPONENT main)