Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-08-18 03:19:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make use of cgal configurable

Browse Source
This commit is contained in:
Thomas Krijnen
2019-05-15 11:13:58 +02:00
parent 9cb321e73d
commit 4400a6ea4f
9 changed files with 102 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
win/patches/V7_3_0.patch
+1 -1
View File
@@ -27,7 +27,7 @@ index 09da18d38..a07b9cf74 100644
+# set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNo_Exception")
+# set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNo_Exception")
+
+if (MSVC)
+if (OCCT_USE_STATIC_RUNTIME AND MSVC)
+ foreach(flag CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL
+ CMAKE_CXX_FLAGS_RELWITHDEBINFO CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE
+ CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO)
win/patches/cgal_no_zlib.patch
+13
View File
@@ -0,0 +1,13 @@
diff --git a/Installation/cmake/modules/CGAL_SetupCGAL_ImageIODependencies.cmake b/Installation/cmake/modules/CGAL_SetupCGAL_ImageIODependencies.cmake
index 8ac856d037..742fa8df69 100644
--- a/Installation/cmake/modules/CGAL_SetupCGAL_ImageIODependencies.cmake
+++ b/Installation/cmake/modules/CGAL_SetupCGAL_ImageIODependencies.cmake
@@ -23,7 +23,7 @@ set(CGAL_SetupCGAL_ImageIODependencies_included TRUE)
# Used Modules
# ^^^^^^^^^^^^
# - :module:`FindZLIB`
-find_package( ZLIB )
+# find_package( ZLIB )
define_property(TARGET PROPERTY CGAL_TARGET_USES_ZLIB
BRIEF_DOCS "Tells if the target uses ZLIB as a dependency"
win/patches/mpfr.patch
+3 -3
View File
@@ -1,5 +1,5 @@
--- afn
+++ bfn
@@ -26 +26 @@
--- a/build.vc15/lib_mpfr/lib_mpfr.vcxproj
+++ a/build.vc15/lib_mpfr/lib_mpfr.vcxproj
@@ -25 +25 @@
- <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>sdk</WindowsTargetPlatformVersion>
win/patches/mpfr_runtime.patch
+8
View File
@@ -0,0 +1,8 @@
--- a/build.vc15/lib_mpfr/lib_mpfr.vcxproj
+++ a/build.vc15/lib_mpfr/lib_mpfr.vcxproj
@@ -148 +148 @@
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -179 +179 @@
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
win/patches/mpir.patch
+7
View File
@@ -0,0 +1,7 @@
diff --git a/msvc/vs17/fn/fn.vcxproj b/msvc/vs17/fn/fn.vcxproj
index d8d87f8f..e543adc8 100644
--- a/msvc/vs17/fn/fn.vcxproj
+++ b/msvc/vs17/fn/fn.vcxproj
@@ -25 +25 @@
- <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>sdk</WindowsTargetPlatformVersion>
win/patches/mpir_runtime.patch
+13
View File
@@ -0,0 +1,13 @@
diff --git a/msvc/mpir_release_lib.props b/msvc/mpir_release_lib.props
index d46f9649..832c6937 100644
--- a/msvc/mpir_release_lib.props
+++ b/msvc/mpir_release_lib.props
@@ -9,7 +9,7 @@
<ItemDefinitionGroup>
<ClCompile>
<ObjectFileName>$(IntDir)du\m\my\%(RelativeDir)</ObjectFileName>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<ProgramDataBaseFileName>$(TargetDir)$(TargetName).pdb</ProgramDataBaseFileName>
</ClCompile>
<Link>