add cmake for example/LoadFileExampleConsole

Author: ifcapps

CMakeLists.txt

@@ -16,6 +16,7 @@ MESSAGE(STATUS "Build type: ${CMAKE_BUILD_TYPE}")
 project(IFCPP)
 MESSAGE(STATUS "------------------------------------------------------------------------")
 
+OPTION(BUILD_CONSOLE_APPLICATION "Build an example CLI application" ON)
 OPTION(BUILD_VIEWER_APPLICATION "Build the viewer example application" ON)
 option(USE_OSG_DEBUG "Use openscenegraph debug library" OFF)
 OPTION(BUILD_STATIC_LIBRARY "Build static library" ON)
@@ -53,6 +54,9 @@ INSTALL(
   FILES ${config_file_output}
   DESTINATION ${IFCPP_CONFIG_DIR})
 
+IF(BUILD_CONSOLE_APPLICATION)
+  ADD_SUBDIRECTORY (examples/LoadFileExampleConsole)
+ENDIF()
 IF(BUILD_VIEWER_APPLICATION)
   ADD_SUBDIRECTORY (examples/SimpleViewerExampleQt)
 ENDIF()

IfcPlusPlus/CMakeLists.txt

@@ -20,8 +20,6 @@ SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYP
 SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE})
 ENDIF(NOT WIN32)
 
-#FIND_PACKAGE(Boost REQUIRED COMPONENTS date_time)
-
 FILE (GLOB ifc4_source "src/ifcpp/IFC4/lib/*.cpp")
 
 if(UNIX)
@@ -63,7 +61,6 @@ endif(UNIX)
 
 if (MSVC)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj ")
-    
 ENDIF()
 
 IF(BUILD_STATIC_LIBRARY)
@@ -77,7 +74,6 @@ ENDIF(BUILD_STATIC_LIBRARY)
 TARGET_LINK_LIBRARIES(IfcPlusPlus
   PUBLIC
     carve
-    ${Boost_LIBRARIES}
     ${VC_LIBS}
     )
 
@@ -86,18 +82,6 @@ TARGET_INCLUDE_DIRECTORIES(IfcPlusPlus
     "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>"
     "$<INSTALL_INTERFACE:include>")
 
-IF(Boost_FOUND)
-
-    TARGET_INCLUDE_DIRECTORIES(IfcPlusPlus
-      PUBLIC
-        ${Boost_INCLUDE_DIRS})
-
-    TARGET_COMPILE_DEFINITIONS(IfcPlusPlus
-      PUBLIC
-        CARVE_SYSTEM_BOOST)
-
-ENDIF()
-
 set_target_properties(IfcPlusPlus PROPERTIES DEBUG_POSTFIX "d")
 
 IF(WIN32)

IfcPlusPlus/IfcPlusPlus.vcxproj

@@ -173,8 +173,8 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>src;$(BOOST_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_WINDOWS;WINDOWS;UNICODE;WIN32;WIN64;_DEBUG;_CRT_SECURE_NO_WARNINGS;_MBCS;IFCQUERY_AS_DYNAMIC_LIBRARY;IFCQUERY_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_WINDOWS;WINDOWS;UNICODE;WIN32;WIN64;_DEBUG;_CRT_SECURE_NO_WARNINGS;_MBCS;IFCQUERY_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
       <EnableParallelCodeGeneration>
@@ -208,7 +208,7 @@
       <AdditionalIncludeDirectories>src;../Carve/src/;../Carve/src/include;../Carve/src/common;$(BOOST_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <PreprocessorDefinitions>UNICODE;WIN32;_WINDOWS;NDEBUG;_MBCS;ENABLE_OPENMP;IFCPP_AS_DYNAMIC_LIBRARY;IFCPP_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>UNICODE;WIN32;_WINDOWS;NDEBUG;_MBCS;ENABLE_OPENMP;IFCQUERY_AS_DYNAMIC_LIBRARY;IFCQUERY_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <OpenMPSupport>true</OpenMPSupport>
       <DebugInformationFormat />
@@ -253,7 +253,7 @@
       <IntrinsicFunctions>false</IntrinsicFunctions>
       <AdditionalIncludeDirectories>src;$(BOOST_DIR);(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <PreprocessorDefinitions>CARVE_SYSTEM_BOOST;UNICODE;WIN32;_WINDOWS;NDEBUG;_MBCS;ENABLE_OPENMP;IFCQUERY_AS_DYNAMIC_LIBRARY;IFCQUERY_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>UNICODE;WIN32;_WINDOWS;NDEBUG;_MBCS;ENABLE_OPENMP;IFCQUERY_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
       <FloatingPointExceptions>true</FloatingPointExceptions>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -1550,6 +1550,7 @@
     <ClCompile Include="src\ifcpp\model\AttributeObject.cpp" />
     <ClCompile Include="src\ifcpp\model\BuildingGuid.cpp" />
     <ClCompile Include="src\ifcpp\model\BuildingModel.cpp" />
+    <ClCompile Include="src\ifcpp\model\PythonWrapperInterface.cpp" />
     <ClCompile Include="src\ifcpp\model\UnitConverter.cpp" />
     <ClCompile Include="src\ifcpp\reader\AbstractReader.cpp" />
     <ClCompile Include="src\ifcpp\reader\ReaderSTEP.cpp" />

IfcPlusPlus/IfcPlusPlus.vcxproj.filters

@@ -3857,5 +3857,8 @@
     <ClCompile Include="src\ifcpp\IFC4\lib\IfcTriangulatedIrregularNetwork.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
+    <ClCompile Include="src\ifcpp\model\PythonWrapperInterface.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>

IfcPlusPlus/src/ifcpp/geometry/Carve/CSG_Adapter.h

@@ -949,9 +949,9 @@ namespace CSG_Adapter
 						result.reset();
 					}
 #ifdef _DEBUG
-					carve::geom::vector<4> color = carve::geom::VECTOR(0.7, 0.7, 0.7, 1.0);
+					carve::geom::vector<4> color = carve::geom::VECTOR(0.7, 0.7, 0.7, 0.05);
 					GeomDebugDump::dumpMeshset(op1, color, true, false);
-					//GeomDebugDump::moveOffset(op1);
+					color = carve::geom::VECTOR(0.5, 0.7, 0.5, 1.0);
 					GeomDebugDump::dumpMeshset(op2, color, true);
 					GeomDebugDump::moveOffset(op1);
 					GeomDebugDump::moveOffset(op2);
@@ -970,7 +970,7 @@ namespace CSG_Adapter
 
 			if( result_meshset_ok )
 			{
-				simplifyMesh( result, true, report_callback, entity.get());
+				//simplifyMesh( result, true, report_callback, entity.get());
 			}
 			else
 			{