#1153 work on embedding svgfill in ifcopenshell wrapper

This commit is contained in:
Thomas Krijnen
2021-08-07 23:09:19 +02:00
parent 872306fdd0
commit 2f8ff9391c
13 changed files with 197 additions and 9 deletions
+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"
+5
View File
@@ -0,0 +1,5 @@
--- a/build.vc15/fn/fn.vcxproj
+++ a/build.vc15/fn/fn.vcxproj
@@ -25 +25 @@
- <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>sdk</WindowsTargetPlatformVersion>
+10
View File
@@ -0,0 +1,10 @@
diff --git a/build.vc15/lib_mpfr/lib_mpfr.vcxproj b/build.vc15/lib_mpfr/lib_mpfr.vcxproj
index a3c72e48..85da0bcc 100644
--- a/build.vc15/lib_mpfr/lib_mpfr.vcxproj
+++ b/build.vc15/lib_mpfr/lib_mpfr.vcxproj
@@ -148 +148 @@
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -179 +179 @@
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+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>
+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>