Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-10-01 20:49:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reference correct cgal kernel impl and build wrapper with /force:multiple as well

Browse Source
This commit is contained in:
Thomas Krijnen
2023-08-26 13:42:42 +02:00
parent 4bb3cc5c90
commit 4127247230
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/CMakeLists.txt
+7 -6
View File
@@ -946,12 +946,6 @@ TARGET_LINK_LIBRARIES(Serializers ${SERIALIZER_SCHEMA_LIBRARIES} ${OPENCOLLADA_L
endif() endif()
if (MSVC)
# @todo still needs to be understood better, but the cgal and cgal-simple kernel cause multiply defined boost lambda placeholders _1 ... _3
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /FORCE:MULTIPLE")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /FORCE:MULTIPLE")
endif()
if (BUILD_CONVERT) if (BUILD_CONVERT)
if (WITH_CGAL AND CITYJSON_SUPPORT) if (WITH_CGAL AND CITYJSON_SUPPORT)
@@ -1046,6 +1040,13 @@ if (GIT_FOUND)
endif() endif()
endif() endif()
if (MSVC)
# @todo still needs to be understood better, but the cgal and cgal-simple kernel cause multiply defined boost lambda placeholders _1 ... _3
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /FORCE:MULTIPLE")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /FORCE:MULTIPLE")
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /FORCE:MULTIPLE")
endif()
# Documentation # Documentation
IF(BUILD_DOCUMENTATION) IF(BUILD_DOCUMENTATION)
set(CMAKE_MODULE_PATH "../docs/cmake") set(CMAKE_MODULE_PATH "../docs/cmake")
src/ifcgeom/AbstractKernel.cpp
+1
View File
@@ -14,6 +14,7 @@
#undef CGALCONVERSIONRESULT_H #undef CGALCONVERSIONRESULT_H
#define IFOPSH_SIMPLE_KERNEL #define IFOPSH_SIMPLE_KERNEL
#include "../ifcgeom/kernels/cgal/CgalKernel.h" #include "../ifcgeom/kernels/cgal/CgalKernel.h"
#undef CgalKernel
#endif #endif
using namespace ifcopenshell::geometry; using namespace ifcopenshell::geometry;