mirror of
https://github.com/IfcOpenShell/IfcOpenShell.git
synced 2026-09-26 02:07:36 +00:00
Fix kernel/mapping plugin output dir and IfcViewer link dependencies
Use $<TARGET_FILE_DIR:IfcGeom> instead of hardcoded
${CMAKE_BINARY_DIR}/ifcgeom/$<CONFIG> for plugin runtime dirs — the
old path was wrong on non-MSVC generators where $<CONFIG> expands
empty. Add explicit add_dependencies for kernel/mapping plugins so
IfcViewer waits for them to build, and drop the redundant direct link
against ${kernel_libraries}.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
message(STATUS "GEOMETRY_KERNELS ${GEOMETRY_KERNELS}")
|
message(STATUS "GEOMETRY_KERNELS ${GEOMETRY_KERNELS}")
|
||||||
|
|
||||||
set(kernel_plugin_runtime_dir "${CMAKE_BINARY_DIR}/ifcgeom/$<CONFIG>")
|
set(kernel_plugin_runtime_dir "$<TARGET_FILE_DIR:IfcGeom>")
|
||||||
|
|
||||||
foreach(kernel ${GEOMETRY_KERNELS})
|
foreach(kernel ${GEOMETRY_KERNELS})
|
||||||
string(TOUPPER ${kernel} KERNEL_UPPER)
|
string(TOUPPER ${kernel} KERNEL_UPPER)
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
find_package(Eigen3 REQUIRED)
|
find_package(Eigen3 REQUIRED)
|
||||||
|
|
||||||
set(mapping_plugin_runtime_dir "${CMAKE_BINARY_DIR}/ifcgeom/$<CONFIG>")
|
set(mapping_plugin_runtime_dir "$<TARGET_FILE_DIR:IfcGeom>")
|
||||||
|
|
||||||
foreach(schema ${SCHEMA_VERSIONS})
|
foreach(schema ${SCHEMA_VERSIONS})
|
||||||
file(GLOB IFCGEOM_I_FILES *.i)
|
file(GLOB IFCGEOM_I_FILES *.i)
|
||||||
|
|||||||
@@ -40,10 +40,11 @@ set_target_properties(IfcViewer PROPERTIES
|
|||||||
MACOSX_BUNDLE ON
|
MACOSX_BUNDLE ON
|
||||||
)
|
)
|
||||||
|
|
||||||
|
add_dependencies(IfcViewer ${kernel_libraries} ${mapping_libraries})
|
||||||
|
|
||||||
target_link_libraries(IfcViewer PRIVATE
|
target_link_libraries(IfcViewer PRIVATE
|
||||||
IfcGeom
|
IfcGeom
|
||||||
IfcParse
|
IfcParse
|
||||||
${kernel_libraries}
|
|
||||||
${OpenCASCADE_LIBRARIES}
|
${OpenCASCADE_LIBRARIES}
|
||||||
${Boost_LIBRARIES}
|
${Boost_LIBRARIES}
|
||||||
${CGAL_LIBRARIES}
|
${CGAL_LIBRARIES}
|
||||||
|
|||||||
Reference in New Issue
Block a user