Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-20 15:08:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

FindCGAL - another fix for 6591a6981

Browse Source
This commit is contained in:
Andrej730
2025-12-11 16:00:48 +05:00
parent f708594853
commit 71a36147a6
4 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/CMakeLists.txt
+1 -1
View File
@@ -199,7 +199,7 @@ endforeach()
if(WITH_CGAL) if(WITH_CGAL)
find_package(CGAL REQUIRED) find_package(CGAL REQUIRED)
set(CGAL_LIBRARIES CGAL::CGAL) set(CGAL_LIBRARIES CGAL::CGAL_INTERFACE)
list(APPEND GEOMETRY_KERNELS cgal) list(APPEND GEOMETRY_KERNELS cgal)
endif() endif()
cmake/FindCGAL.cmake
+7 -3
View File
@@ -10,10 +10,10 @@
# Input variables could also be provided as environment variables. # Input variables could also be provided as environment variables.
# #
# Output targets: # Output targets:
# - `CGAL::CGAL` # - `CGAL::CGAL_INTERFACE`
# #
if(TARGET CGAL::CGAL) if(TARGET CGAL::CGAL_INTERFACE)
return() return()
endif() endif()
@@ -56,5 +56,9 @@ else()
message(STATUS "CGAL: found config at '${CGAL_DIR}'.") message(STATUS "CGAL: found config at '${CGAL_DIR}'.")
endif() endif()
target_compile_definitions(CGAL::CGAL INTERFACE IFOPSH_WITH_CGAL) # Adding another `CGAL_INTERFACE` target, because we want to add compile definitions to it,
# but in `CGALconfig.cmake` `CGAL::CGAL` is an alias, so you can't add properties to it.
add_library(CGAL::CGAL_INTERFACE INTERFACE IMPORTED)
target_link_libraries(CGAL::CGAL_INTERFACE INTERFACE CGAL::CGAL)
target_compile_definitions(CGAL::CGAL_INTERFACE INTERFACE IFOPSH_WITH_CGAL)
set(SWIG_DEFINES ${SWIG_DEFINES} -DIFOPSH_WITH_CGAL) set(SWIG_DEFINES ${SWIG_DEFINES} -DIFOPSH_WITH_CGAL)
src/ifcgeom/kernels/CMakeLists.txt
+2 -2
View File
@@ -15,7 +15,7 @@ foreach(kernel ${GEOMETRY_KERNELS})
if(${kernel} STREQUAL "cgal") if(${kernel} STREQUAL "cgal")
find_package(CGAL REQUIRED) find_package(CGAL REQUIRED)
target_link_libraries(${KERNEL_TARGET} CGAL::CGAL) target_link_libraries(${KERNEL_TARGET} CGAL::CGAL_INTERFACE)
set_property(TARGET ${KERNEL_TARGET} APPEND_STRING PROPERTY COMPILE_FLAGS " -DCGAL_HAS_THREADS") set_property(TARGET ${KERNEL_TARGET} APPEND_STRING PROPERTY COMPILE_FLAGS " -DCGAL_HAS_THREADS")
set(KERNEL_TARGET_SIMPLE "${KERNEL_TARGET}_simple") set(KERNEL_TARGET_SIMPLE "${KERNEL_TARGET}_simple")
@@ -23,7 +23,7 @@ foreach(kernel ${GEOMETRY_KERNELS})
set_target_properties(${KERNEL_TARGET_SIMPLE} PROPERTIES COMPILE_FLAGS "-DIFC_GEOM_EXPORTS -DIFOPSH_SIMPLE_KERNEL -DCGAL_HAS_THREADS") set_target_properties(${KERNEL_TARGET_SIMPLE} PROPERTIES COMPILE_FLAGS "-DIFC_GEOM_EXPORTS -DIFOPSH_SIMPLE_KERNEL -DCGAL_HAS_THREADS")
list(APPEND kernel_libraries ${KERNEL_TARGET_SIMPLE}) list(APPEND kernel_libraries ${KERNEL_TARGET_SIMPLE})
target_link_libraries(${KERNEL_TARGET_SIMPLE} ${${KERNEL_UPPER}_LIBRARIES} Eigen3::Eigen) target_link_libraries(${KERNEL_TARGET_SIMPLE} ${${KERNEL_UPPER}_LIBRARIES} Eigen3::Eigen)
target_link_libraries(${KERNEL_TARGET_SIMPLE} CGAL::CGAL) target_link_libraries(${KERNEL_TARGET_SIMPLE} CGAL::CGAL_INTERFACE)
elseif(${kernel} STREQUAL "opencascade") elseif(${kernel} STREQUAL "opencascade")
target_link_libraries(${KERNEL_TARGET} ${OpenCASCADE_LIBRARIES}) target_link_libraries(${KERNEL_TARGET} ${OpenCASCADE_LIBRARIES})
endif() endif()
src/svgfill/CMakeLists.txt
+1 -1
View File
@@ -56,7 +56,7 @@ file(GLOB LIB_H_FILES src/*.h)
file(GLOB LIB_CPP_FILES src/svgfill.cpp src/arrange_polygons.cpp) file(GLOB LIB_CPP_FILES src/svgfill.cpp src/arrange_polygons.cpp)
set(LIB_SRC_FILES ${LIB_H_FILES} ${LIB_CPP_FILES}) set(LIB_SRC_FILES ${LIB_H_FILES} ${LIB_CPP_FILES})
add_library(svgfill ${LIB_SRC_FILES}) add_library(svgfill ${LIB_SRC_FILES})
target_link_libraries(svgfill ${Boost_LIBRARIES} ${BCRYPT_LIBRARIES} LibXml2::LibXml2 CGAL::CGAL) target_link_libraries(svgfill ${Boost_LIBRARIES} ${BCRYPT_LIBRARIES} LibXml2::LibXml2 CGAL::CGAL_INTERFACE)
add_executable(svgfill_exe src/main.cpp) add_executable(svgfill_exe src/main.cpp)
target_link_libraries(svgfill_exe svgfill) target_link_libraries(svgfill_exe svgfill)