integrate carve source into main library

Author: ifcapps

.gitignore

@@ -36,12 +36,12 @@ examples/SimpleViewerExampleMFC/dump_mesh_debug.txt
 examples/SimpleViewerExampleMFC/x64/
 examples/SimpleViewerExampleMFC/.vs/IfcQueryViewer/v15/.suo
 examples/SimpleViewerExampleMFC/.vs/SimpleViewerExampleMFC/v15/.suo
-examples/CreateWallAndWriteFile/CreateWallAndWriteFile/x64/
-examples/CreateWallAndWriteFile/CreateWallAndWriteFile/SimpleWall.ifc
-examples/CreateWallAndWriteFile/SimpleWall.ifc
+examples/CreateIfcWallAndWriteFile/CreateIfcWallAndWriteFile/x64/
+examples/CreateIfcWallAndWriteFile/CreateIfcWallAndWriteFile/SimpleWall.ifc
+examples/CreateIfcWallAndWriteFile/SimpleWall.ifc
 examples/LoadFileExampleNoGUI/LoadFileExampleNoGUI/x64/
 external/Carve/build/
-examples/CreateWallAndWriteFile/x64/
+examples/CreateIfcWallAndWriteFile/x64/
 examples/LoadFileWithGeometryExampleConsole/dump_mesh_debug.txt
 IfcPlusPlus-*
 IfcPlusPlus/src/ifcpp/geometry/Carve - Copy/

CMakeLists.txt

@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED (VERSION 3.7.2)
+CMAKE_MINIMUM_REQUIRED (VERSION 3.6)
 project(IfcPlusPlus)
 
 # Set a default build type if none was specified https://blog.kitware.com/cmake-and-the-default-build-type/
@@ -24,7 +24,6 @@ else(NOT WIN32)
 	option(BUILD_VIEWER_APPLICATION "Build the viewer example application" OFF)
 endif()
 option(USE_OSG_DEBUG "Use openscenegraph debug library" OFF)
-option(BUILD_STATIC_LIBRARY "Build static library" OFF)
 
 IF(NOT WIN32)
     IF("${CMAKE_BUILD_TYPE}" MATCHES "Debug")
@@ -46,10 +45,7 @@ if (OPENMP_FOUND)
     set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}")
 endif()
 
-set(CARVE_SOURCE_DIR ${IFCPP_SOURCE_DIR}/external/Carve)
-set(CARVE_BINARY_DIR ${IFCPP_BINARY_DIR})
 set(IFCPP_CONFIG_DIR "share/IFCPP/cmake")
-ADD_SUBDIRECTORY (external/Carve)
 ADD_SUBDIRECTORY (IfcPlusPlus)
 
 # Install configuration file
@@ -67,9 +63,9 @@ INSTALL(
   DESTINATION ${IFCPP_CONFIG_DIR})
 
 IF(BUILD_CONSOLE_APPLICATION)
-  ADD_SUBDIRECTORY (examples/CreateWallAndWriteFile)
-  ADD_SUBDIRECTORY (examples/LoadFileExampleConsole)
-  ADD_SUBDIRECTORY (examples/LoadFileWithGeometryExampleConsole)
+  ADD_SUBDIRECTORY (examples/CreateIfcWallAndWriteFile)
+  ADD_SUBDIRECTORY (examples/LoadFileExample)
+  ADD_SUBDIRECTORY (examples/LoadFileWithGeometryExample)
 ENDIF()
 IF(BUILD_VIEWER_APPLICATION)
   ADD_SUBDIRECTORY (examples/SimpleViewerExampleQt)

IfcPlusPlus/CMakeLists.txt

@@ -1,6 +1,17 @@
-cmake_minimum_required (VERSION 2.8...3.7.2)
+cmake_minimum_required (VERSION 3.6...3.9)
 project(IfcPlusPlus)
 
+ADD_DEFINITIONS(-DIFCQUERY_STATIC_LIB)
+ADD_DEFINITIONS(-DGLM_FORCE_CTOR_INIT)
+ADD_DEFINITIONS(-DGLM_FORCE_XYZW_ONLY)
+ADD_DEFINITIONS(-D_HAS_AUTO_PTR_ETC=1)
+ADD_DEFINITIONS(-DUNICODE)
+ADD_DEFINITIONS(-D_UNICODE)
+ADD_DEFINITIONS(-DTHRUST_DEVICE_SYSTEM=THRUST_DEVICE_SYSTEM_CPP)
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD C++17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
 if(WIN32)
 	# for vs2017
 	set(VC_LIBS Bcrypt.lib)
@@ -23,32 +34,67 @@ set(IFCPP_SOURCE_FILES
 	src/ifcpp/model/BuildingGuid.cpp
     src/ifcpp/model/BuildingModel.cpp
     src/ifcpp/model/UnitConverter.cpp
-    src/ifcpp/reader/AbstractReader.cpp
     src/ifcpp/reader/ReaderSTEP.cpp
-    src/ifcpp/reader/ReaderXML.cpp
     src/ifcpp/reader/ReaderUtil.cpp
     src/ifcpp/writer/WriterSTEP.cpp
     src/ifcpp/writer/WriterUtil.cpp
+	src/external/manifold/src/boolean3.cpp
+    src/external/manifold/src/boolean_result.cpp
+    src/external/manifold/src/collider/src/collider.cpp
+    src/external/manifold/src/constructors.cpp
+    src/external/manifold/src/csg_tree.cpp
+    src/external/manifold/src/edge_op.cpp
+    src/external/manifold/src/face_op.cpp
+    src/external/manifold/src/impl.cpp
+    src/external/manifold/src/manifold.cpp
+    src/external/manifold/src/polygon/src/polygon.cpp
+    src/external/manifold/src/properties.cpp
+    src/external/manifold/src/smoothing.cpp
+    src/external/manifold/src/sort.cpp
+    src/external/manifold/src/third_party/graphlite/src/connected_components.cpp
+    src/external/manifold/src/utilities/src/detect_cuda.cpp
+	src/external/Carve/src/lib/aabb.cpp
+	src/external/Carve/src/lib/carve.cpp
+	src/external/Carve/src/lib/convex_hull.cpp
+	src/external/Carve/src/lib/csg.cpp
+	src/external/Carve/src/lib/csg_collector.cpp
+	src/external/Carve/src/lib/edge.cpp
+	src/external/Carve/src/lib/face.cpp
+	src/external/Carve/src/lib/geom.cpp
+	src/external/Carve/src/lib/geom2d.cpp
+	src/external/Carve/src/lib/geom3d.cpp
+	src/external/Carve/src/lib/intersect.cpp
+	src/external/Carve/src/lib/intersect_classify_edge.cpp
+	src/external/Carve/src/lib/intersect_classify_group.cpp
+	src/external/Carve/src/lib/intersect_debug.cpp
+	src/external/Carve/src/lib/intersect_face_division.cpp
+	src/external/Carve/src/lib/intersect_group.cpp
+	src/external/Carve/src/lib/intersect_half_classify_group.cpp
+	src/external/Carve/src/lib/intersection.cpp
+	src/external/Carve/src/lib/math.cpp
+	src/external/Carve/src/lib/mesh.cpp
+	src/external/Carve/src/lib/octree.cpp
+	src/external/Carve/src/lib/pointset.cpp
+	src/external/Carve/src/lib/polyhedron.cpp
+	src/external/Carve/src/lib/polyline.cpp
+	src/external/Carve/src/lib/shewchuk_predicates.cpp
+	src/external/Carve/src/lib/tag.cpp
+	src/external/Carve/src/lib/timing.cpp
+	src/external/Carve/src/lib/triangle_intersection.cpp
+	src/external/Carve/src/lib/triangulator.cpp
+	src/external/Carve/src/common/geometry.cpp  
 )
 
 if (MSVC)
 	set(IFCPP_SOURCE_FILES 
         src/external/XUnzip.cpp  # do not add src/external/XUnzip.cpp on unix platforms
         ${IFCPP_SOURCE_FILES})
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj ")
+    #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj ")
+	set_source_files_properties(src/ifcpp/IFC4X3/EntityFactory.cpp PROPERTIES COMPILE_FLAGS /bigobj)
+	set_source_files_properties(src/ifcpp/IFC4X3/TypeFactory.cpp PROPERTIES COMPILE_FLAGS /bigobj)
 endif()
 
-ADD_DEFINITIONS(-DIFCQUERY_AS_DYNAMIC_LIBRARY)
-ADD_DEFINITIONS(-DIFCQUERY_LIB)
-ADD_DEFINITIONS(-DGLM_FORCE_CTOR_INIT)
-ADD_DEFINITIONS(-DGLM_FORCE_XYZW_ONLY)
-ADD_DEFINITIONS(-D_HAS_AUTO_PTR_ETC=1)
-ADD_DEFINITIONS(-DUNICODE)
-ADD_DEFINITIONS(-D_UNICODE)
-set(CMAKE_CXX_STANDARD 20)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
-add_library(IfcPlusPlus SHARED ${IFCPP_SOURCE_FILES})
+add_library(IfcPlusPlus STATIC ${IFCPP_SOURCE_FILES})
 
 if(OpenMP_CXX_FOUND)
 	ADD_DEFINITIONS(-DENABLE_OPENMP)
@@ -58,19 +104,38 @@ if(OpenMP_CXX_FOUND)
 endif()
 
 
-target_include_directories(IfcPlusPlus
-  PUBLIC
-	"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>"
-	"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/external>"
-	"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/ifcpp/IFC4/include>"
-	"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/ifcpp/IFC4X3/include>"
-    "$<INSTALL_INTERFACE:include>")
+TARGET_INCLUDE_DIRECTORIES(IfcPlusPlus
+    PRIVATE
+	${CMAKE_CURRENT_SOURCE_DIR}/src
+	${IFCPP_SOURCE_DIR}/IfcPlusPlus/src
+	${IFCPP_SOURCE_DIR}/IfcPlusPlus/src/ifcpp/IFC4X3/include
+	${IFCPP_SOURCE_DIR}/IfcPlusPlus/src/external
+	${IFCPP_SOURCE_DIR}/IfcPlusPlus/src/external/glm
+	${IFCPP_SOURCE_DIR}/IfcPlusPlus/src/external/Carve/include
+	${IFCPP_SOURCE_DIR}/IfcPlusPlus/src/external/Carve/src
+	${IFCPP_SOURCE_DIR}/IfcPlusPlus/src/external/Carve/src/include
+	${IFCPP_SOURCE_DIR}/IfcPlusPlus/src/external/Carve/src/common
+	${IFCPP_SOURCE_DIR}/IfcPlusPlus/src/external/Carve/build/src
+	${IFCPP_SOURCE_DIR}/IfcPlusPlus/src/external/glm
+	${IFCPP_SOURCE_DIR}/IfcPlusPlus/src/external/manifold/src/utilities/include
+	${IFCPP_SOURCE_DIR}/IfcPlusPlus/src/external/manifold/src/utilities
+	${IFCPP_SOURCE_DIR}/IfcPlusPlus/src/external/manifold/src/polygon/include
+	${IFCPP_SOURCE_DIR}/IfcPlusPlus/src/external/manifold/src/manifold/include
+	${IFCPP_SOURCE_DIR}/IfcPlusPlus/src/external/manifold/src
+	${IFCPP_SOURCE_DIR}/IfcPlusPlus/src/external/manifold/src/collider/include
+	${IFCPP_SOURCE_DIR}/IfcPlusPlus/src/external/manifold/src/third_party
+	${IFCPP_SOURCE_DIR}/IfcPlusPlus/src/external/manifold/src/third_party/thrust
+	${IFCPP_SOURCE_DIR}/IfcPlusPlus/src/external/manifold/src/third_party/graphlite/include
+)
+
 
 set_target_properties(IfcPlusPlus PROPERTIES DEBUG_POSTFIX "d")
-set_target_properties(IfcPlusPlus PROPERTIES CXX_STANDARD 20)
+set_target_properties(IfcPlusPlus PROPERTIES CXX_STANDARD 17)
 
 if(WIN32)
     set_target_properties(IfcPlusPlus PROPERTIES LINK_FLAGS_DEBUG "/debug /INCREMENTAL:NO")
+	add_definitions("/wd4018 /wd4305")
+	target_compile_options(IfcPlusPlus PRIVATE /W2)
 endif()
 
 install(