update openmp in cmake files

ifcapps · ifcapps · commit c23c01d46a4c · 2021-02-15T14:56:03.000+01:00
diff --git a/Build IFC++.pdf b/Build IFC++.pdf
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -19,7 +19,7 @@ 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)
+OPTION(BUILD_STATIC_LIBRARY "Build static library" OFF)
 
 IF(NOT WIN32)
     IF("${CMAKE_BUILD_TYPE}" MATCHES "Debug")
diff --git a/IfcPlusPlus/IfcPlusPlus.vcxproj b/IfcPlusPlus/IfcPlusPlus.vcxproj
@@ -1550,7 +1550,6 @@
     <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" />
diff --git a/IfcPlusPlus/IfcPlusPlus.vcxproj.filters b/IfcPlusPlus/IfcPlusPlus.vcxproj.filters
@@ -3857,8 +3857,5 @@
     <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>
diff --git a/IfcPlusPlus/src/ifcpp/geometry/Carve/ConverterOSG.h b/IfcPlusPlus/src/ifcpp/geometry/Carve/ConverterOSG.h
@@ -26,6 +26,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OU
 #include <osgUtil/Tessellator>
 
 #include <ifcpp/model/BasicTypes.h>
+#include <ifcpp/model/OpenMPIncludes.h>
 #include <ifcpp/model/StatusCallback.h>
 #include <ifcpp/IFC4/include/IfcCurtainWall.h>
 #include <ifcpp/IFC4/include/IfcFeatureElementSubtraction.h>
diff --git a/IfcPlusPlus/src/ifcpp/geometry/Carve/GeometryConverter.h b/IfcPlusPlus/src/ifcpp/geometry/Carve/GeometryConverter.h
@@ -20,6 +20,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OU
 #include <unordered_set>
 #include <ifcpp/model/BasicTypes.h>
 #include <ifcpp/model/BuildingModel.h>
+#include <ifcpp/model/OpenMPIncludes.h>
 #include <ifcpp/model/StatusCallback.h>
 #include <ifcpp/IFC4/include/IfcCurtainWall.h>
 #include <ifcpp/IFC4/include/IfcGloballyUniqueId.h>
diff --git a/IfcPlusPlus/src/ifcpp/geometry/OCC/GeometryConverterOCC.h b/IfcPlusPlus/src/ifcpp/geometry/OCC/GeometryConverterOCC.h
@@ -32,6 +32,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OU
 #include <ifcpp/geometry/GeometrySettings.h>
 #include <ifcpp/model/BuildingModel.h>
 #include <ifcpp/model/BasicTypes.h>
+#include <ifcpp/model/OpenMPIncludes.h>
 #include <ifcpp/model/StatusCallback.h>
 #include <ifcpp/IFC4/include/IfcCurtainWall.h>
 #include <ifcpp/IFC4/include/IfcPropertySetDefinitionSet.h>
diff --git a/IfcPlusPlus/src/ifcpp/geometry/OCC/SceneGraphConverterOCC.h b/IfcPlusPlus/src/ifcpp/geometry/OCC/SceneGraphConverterOCC.h
@@ -43,6 +43,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OU
 #include <ifcpp/geometry/SceneGraphUtils.h>
 #include <ifcpp/model/BuildingModel.h>
 #include <ifcpp/model/BasicTypes.h>
+#include <ifcpp/model/OpenMPIncludes.h>
 #include <ifcpp/model/StatusCallback.h>
 #include <ifcpp/IFC4/include/IfcCurtainWall.h>
 #include <ifcpp/IFC4/include/IfcFeatureElementSubtraction.h>
diff --git a/IfcPlusPlus/src/ifcpp/geometry/StylesConverter.h b/IfcPlusPlus/src/ifcpp/geometry/StylesConverter.h
@@ -21,6 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OU
 
 #include <ifcpp/geometry/AppearanceData.h>
 #include <ifcpp/model/BasicTypes.h>
+#include <ifcpp/model/OpenMPIncludes.h>
 #include <ifcpp/model/StatusCallback.h>
 #include <ifcpp/reader/ReaderUtil.h>
 #include <ifcpp/IFC4/include/IfcSpecularHighlightSelect.h>
diff --git a/IfcPlusPlus/src/ifcpp/model/OpenMPIncludes.h b/IfcPlusPlus/src/ifcpp/model/OpenMPIncludes.h
@@ -17,8 +17,15 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OU
 
 #pragma once
 
-#ifdef ENABLE_OPENMP
+#ifndef _DEBUG
+	#ifndef ENABLE_OPENMP
+		#if defined(_OPENMP)
+			#define ENABLE_OPENMP
+		#endif
+	#endif
+#endif
 
+#ifdef ENABLE_OPENMP
 #include <omp.h>
 
 class Mutex 
diff --git a/IfcPlusPlus/src/ifcpp/model/PythonWrapperInterface.cpp b/IfcPlusPlus/src/ifcpp/model/PythonWrapperInterface.cpp
diff --git a/examples/LoadFileExampleConsole/CMakeLists.txt b/examples/LoadFileExampleConsole/CMakeLists.txt
@@ -13,6 +13,7 @@ IF(NOT WIN32)
     SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE})
 ENDIF(NOT WIN32)
 
+find_package(OpenMP)
 
 SET(app_dir ${IFCPP_SOURCE_DIR}/examples/LoadFileExampleConsole)
 
@@ -28,7 +29,13 @@ ADD_EXECUTABLE(LoadFileExampleConsole
 )
 
 set_target_properties(LoadFileExampleConsole PROPERTIES DEBUG_POSTFIX "d")
-TARGET_LINK_LIBRARIES(LoadFileExampleConsole IfcPlusPlus)
+
+
+if(OpenMP_CXX_FOUND)
+    TARGET_LINK_LIBRARIES(LoadFileExampleConsole IfcPlusPlus PUBLIC OpenMP::OpenMP_CXX)
+else(OpenMP_CXX_FOUND)
+	TARGET_LINK_LIBRARIES(LoadFileExampleConsole IfcPlusPlus)
+endif()
 
 TARGET_INCLUDE_DIRECTORIES(LoadFileExampleConsole
     PRIVATE
diff --git a/examples/SimpleViewerExampleQt/SimpleViewerExampleQt.vcxproj b/examples/SimpleViewerExampleQt/SimpleViewerExampleQt.vcxproj
@@ -156,7 +156,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>ENABLE_OPENMP;UNICODE;WIN32;WIN64;NDEBUG;QT_NO_DEBUG;QT_CORE_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_OPENGL_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>UNICODE;WIN32;WIN64;NDEBUG;QT_NO_DEBUG;QT_CORE_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_OPENGL_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(BOOST_DIR);..\..\external\Carve\src;..\..\external\Carve\src\include;..\..\external\Carve\src\common;.;.\src;..\..\IfcPlusPlus\src;..\..\IfcPlusPlusGeometry\src;.\GeneratedFiles;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtNetwork;$(QTDIR)\include\QtOpenGL;$(QTDIR)\include\QtWidgets;$(CSF_OPT_INC);$(OSG_DIR)\include;$(OSG_DIR)\build\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
