mirror of
https://github.com/IfcOpenShell/IfcOpenShell.git
synced 2026-09-10 22:16:41 +00:00
Only use cyclic dependencies when amongst static libs #7180
This commit is contained in:
@@ -1043,11 +1043,7 @@ if(BUILD_IFCGEOM)
|
|||||||
foreach(schema ${SCHEMA_VERSIONS})
|
foreach(schema ${SCHEMA_VERSIONS})
|
||||||
set(IFCGEOM_SCHEMA_LIBRARIES ${IFCGEOM_SCHEMA_LIBRARIES} geometry_mapping_ifc${schema})
|
set(IFCGEOM_SCHEMA_LIBRARIES ${IFCGEOM_SCHEMA_LIBRARIES} geometry_mapping_ifc${schema})
|
||||||
endforeach()
|
endforeach()
|
||||||
if(WASM_BUILD)
|
set(IFCOPENSHELL_LIBRARIES ${IFCOPENSHELL_LIBRARIES} IfcGeom ${IFCGEOM_SCHEMA_LIBRARIES})
|
||||||
set(IFCOPENSHELL_LIBRARIES ${IFCOPENSHELL_LIBRARIES} IfcGeom ${IFCGEOM_SCHEMA_LIBRARIES})
|
|
||||||
else()
|
|
||||||
set(IFCOPENSHELL_LIBRARIES ${IFCOPENSHELL_LIBRARIES} IfcGeom ${IFCGEOM_SCHEMA_LIBRARIES} IfcGeom ${IFCGEOM_SCHEMA_LIBRARIES} IfcGeom)
|
|
||||||
endif()
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(BUILD_CONVERT OR BUILD_IFCPYTHON)
|
if(BUILD_CONVERT OR BUILD_IFCPYTHON)
|
||||||
@@ -1177,6 +1173,9 @@ if(BUILD_IFCGEOM)
|
|||||||
add_library(geometry_mapping_ifc${schema} STATIC ${IFCGEOM_FILES})
|
add_library(geometry_mapping_ifc${schema} STATIC ${IFCGEOM_FILES})
|
||||||
set_target_properties(geometry_mapping_ifc${schema} PROPERTIES COMPILE_FLAGS "-DIFC_GEOM_EXPORTS -DIfcSchema=Ifc${schema}")
|
set_target_properties(geometry_mapping_ifc${schema} PROPERTIES COMPILE_FLAGS "-DIFC_GEOM_EXPORTS -DIfcSchema=Ifc${schema}")
|
||||||
target_link_libraries(geometry_mapping_ifc${schema} IfcParse)
|
target_link_libraries(geometry_mapping_ifc${schema} IfcParse)
|
||||||
|
if (NOT BUILD_SHARED_LIBS)
|
||||||
|
target_link_libraries(geometry_mapping_ifc${schema} IfcGeom)
|
||||||
|
endif()
|
||||||
list(APPEND mapping_libraries geometry_mapping_ifc${schema})
|
list(APPEND mapping_libraries geometry_mapping_ifc${schema})
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user