songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update the patch for Conan 2.0

This commit is contained in:
Laurent Rineau 2023-06-08 17:32:47 +02:00
parent 1b42d8ca60
commit 4d7b71bbb7
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Installation/cmake/modules/CGAL_Eigen3_support.cmake
View File

@ -1,9 +1,14 @@
if(EIGEN3_FOUND AND NOT TARGET CGAL::Eigen3_support) if((EIGEN3_FOUND OR Eigen3_FOUND) AND NOT TARGET CGAL::Eigen3_support)
if(NOT TARGET Threads::Threads) if(NOT TARGET Threads::Threads)
find_package(Threads REQUIRED) find_package(Threads REQUIRED)
endif() endif()
add_library(CGAL::Eigen3_support INTERFACE IMPORTED) add_library(CGAL::Eigen3_support INTERFACE IMPORTED)
set_target_properties(CGAL::Eigen3_support PROPERTIES set_target_properties(CGAL::Eigen3_support PROPERTIES
INTERFACE_COMPILE_DEFINITIONS "CGAL_EIGEN3_ENABLED" INTERFACE_COMPILE_DEFINITIONS "CGAL_EIGEN3_ENABLED")
INTERFACE_INCLUDE_DIRECTORIES "${EIGEN3_INCLUDE_DIR}") if(TARGET Eigen3::Eigen)
target_link_libraries(CGAL::Eigen3_support INTERFACE Eigen3::Eigen)
else()
set_target_properties(CGAL::Eigen3_support PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${EIGEN3_INCLUDE_DIR}")
endif()
endif() endif()

5
Installation/lib/cmake/CGAL/CGALConfig.cmake
View File

@ -146,9 +146,6 @@ foreach(cgal_lib ${CGAL_LIBRARIES})
set(CGALConfig_all_targets_are_defined FALSE) set(CGALConfig_all_targets_are_defined FALSE)
endif() endif()
endforeach() endforeach()
list(APPEND CMAKE_MODULE_PATH ${CGAL_MODULES_DIR})
if(CGALConfig_all_targets_are_defined) if(CGALConfig_all_targets_are_defined)
return() return()
endif() endif()
@ -159,6 +156,8 @@ if(NOT CGAL_FOUND)
return() return()
endif() endif()
list(APPEND CMAKE_MODULE_PATH ${CGAL_MODULES_DIR})
include( ${CGAL_MODULES_DIR}/CGAL_SCM.cmake ) include( ${CGAL_MODULES_DIR}/CGAL_SCM.cmake )
CGAL_detect_git(${CGAL_CONFIG_DIR}/../../../..) CGAL_detect_git(${CGAL_CONFIG_DIR}/../../../..)