From fa22cd972b660b54894c5907c19fdf06cff38d8e Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Thu, 14 Jan 2021 13:58:15 +0100 Subject: [PATCH] Change libpointmatcher_support so it won't fail when old boost has been used to build pointmatcher. --- Installation/cmake/modules/CGAL_pointmatcher_support.cmake | 7 +++---- .../examples/Point_set_processing_3/CMakeLists.txt | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Installation/cmake/modules/CGAL_pointmatcher_support.cmake b/Installation/cmake/modules/CGAL_pointmatcher_support.cmake index c023102661f..520e4d3a2b2 100644 --- a/Installation/cmake/modules/CGAL_pointmatcher_support.cmake +++ b/Installation/cmake/modules/CGAL_pointmatcher_support.cmake @@ -1,7 +1,6 @@ if(libpointmatcher_FOUND AND NOT TARGET CGAL::pointmatcher_support) add_library(CGAL::pointmatcher_support INTERFACE IMPORTED) - set_target_properties(CGAL::pointmatcher_support PROPERTIES - INTERFACE_COMPILE_DEFINITIONS "CGAL_LINKED_WITH_POINTMATCHER" - INTERFACE_INCLUDE_DIRECTORIES "${libpointmatcher_INCLUDE_DIR}" - INTERFACE_LINK_LIBRARIES "${libpointmatcher_LIBRARIES}") + target_compile_definitions(CGAL::pointmatcher_support INTERFACE "CGAL_LINKED_WITH_POINTMATCHER") + target_include_directories(CGAL::pointmatcher_support INTERFACE "${libpointmatcher_INCLUDE_DIR}") + target_link_libraries(CGAL::pointmatcher_support INTERFACE "${libpointmatcher_LIBRARIES}") endif() diff --git a/Point_set_processing_3/examples/Point_set_processing_3/CMakeLists.txt b/Point_set_processing_3/examples/Point_set_processing_3/CMakeLists.txt index 83253368016..93dab1bc293 100644 --- a/Point_set_processing_3/examples/Point_set_processing_3/CMakeLists.txt +++ b/Point_set_processing_3/examples/Point_set_processing_3/CMakeLists.txt @@ -93,6 +93,7 @@ if ( CGAL_FOUND ) find_package(libpointmatcher QUIET) include(CGAL_pointmatcher_support) if (TARGET CGAL::pointmatcher_support) + find_package(Boost COMPONENTS thread filesystem system program_options date_time chrono REQUIRED) add_executable(registration_with_pointmatcher "registration_with_pointmatcher.cpp") target_link_libraries(registration_with_pointmatcher ${CGAL_libs} CGAL::pointmatcher_support)