mirror of
https://github.com/IfcOpenShell/IfcOpenShell.git
synced 2026-08-30 08:33:10 +00:00
fix: Add IfcGeom as a dependency of kernels target instead of the inverse
This commit is contained in:
committed by
Thomas Krijnen
parent
a609bc61b9
commit
128fdcb62e
@@ -218,7 +218,6 @@ if(BUILD_IFCGEOM AND WITH_OPENCASCADE)
|
|||||||
find_package(OpenCASCADE REQUIRED)
|
find_package(OpenCASCADE REQUIRED)
|
||||||
add_definitions(-DIFOPSH_WITH_OPENCASCADE)
|
add_definitions(-DIFOPSH_WITH_OPENCASCADE)
|
||||||
set(SWIG_DEFINES ${SWIG_DEFINES} -DIFOPSH_WITH_OPENCASCADE)
|
set(SWIG_DEFINES ${SWIG_DEFINES} -DIFOPSH_WITH_OPENCASCADE)
|
||||||
# set(OPENCASCADE_LIBRARIES ${OpenCASCADE_LIBRARIES})
|
|
||||||
list(APPEND GEOMETRY_KERNELS opencascade)
|
list(APPEND GEOMETRY_KERNELS opencascade)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|||||||
@@ -31,12 +31,16 @@ find_package(Eigen3 REQUIRED)
|
|||||||
|
|
||||||
target_link_libraries(
|
target_link_libraries(
|
||||||
IfcGeom
|
IfcGeom
|
||||||
${kernel_libraries}
|
|
||||||
${mapping_libraries}
|
${mapping_libraries}
|
||||||
${CMAKE_THREAD_LIBS_INIT}
|
${CMAKE_THREAD_LIBS_INIT}
|
||||||
"Eigen3::Eigen"
|
"Eigen3::Eigen"
|
||||||
${CGAL_LIBRARIES}
|
${CGAL_LIBRARIES}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if(WITH_OPENCASCADE)
|
||||||
|
target_link_libraries(IfcGeom TKernel)
|
||||||
|
endif()
|
||||||
|
|
||||||
if(NOT WASM_BUILD)
|
if(NOT WASM_BUILD)
|
||||||
target_link_libraries(IfcGeom IfcParse)
|
target_link_libraries(IfcGeom IfcParse)
|
||||||
endif()
|
endif()
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ foreach(kernel ${GEOMETRY_KERNELS})
|
|||||||
PROPERTIES COMPILE_FLAGS "-DIFC_GEOM_EXPORTS" PUBLIC_HEADER "${IFCGEOM_H_FILES}"
|
PROPERTIES COMPILE_FLAGS "-DIFC_GEOM_EXPORTS" PUBLIC_HEADER "${IFCGEOM_H_FILES}"
|
||||||
)
|
)
|
||||||
list(APPEND kernel_libraries ${KERNEL_TARGET})
|
list(APPEND kernel_libraries ${KERNEL_TARGET})
|
||||||
target_link_libraries(${KERNEL_TARGET} ${${KERNEL_UPPER}_LIBRARIES} Eigen3::Eigen)
|
target_link_libraries(${KERNEL_TARGET} ${${KERNEL_UPPER}_LIBRARIES} IfcGeom Eigen3::Eigen)
|
||||||
install(
|
install(
|
||||||
TARGETS ${KERNEL_TARGET}
|
TARGETS ${KERNEL_TARGET}
|
||||||
EXPORT ${IFCOPENSHELL_EXPORT_TARGETS}
|
EXPORT ${IFCOPENSHELL_EXPORT_TARGETS}
|
||||||
|
|||||||
Reference in New Issue
Block a user