[collada-dom] use vcpkg minizip/zip.h

it is possible to find the wrong zip.h when doing a full CI test. Force it to find the right one.
microsoft · Mar 19, 2019 · fd03463 · fd03463
1 parent 563ab88
commit fd03463
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/ports/collada-dom/portfile.cmake b/ports/collada-dom/portfile.cmake
@@ -7,8 +7,9 @@ vcpkg_from_github(
     SHA512 cb923d296219765096f5246cc7a2b69712931f58171ae885dbdbd215fca86d911c34d12748d3304d6a5a350dc737ff0caead2495acac488af5431b437cbacc7d
     HEAD_REF v2.5.0
     PATCHES
-        "${CMAKE_CURRENT_LIST_DIR}/vs-version-detection.patch"
-        "${CMAKE_CURRENT_LIST_DIR}/use-uriparser.patch"
+        vs-version-detection.patch
+        use-uriparser.patch
+		use-vcpkg-minizip.patch
 )
 
 vcpkg_configure_cmake(

diff --git a/ports/collada-dom/use-vcpkg-minizip.patch b/ports/collada-dom/use-vcpkg-minizip.patch
@@ -0,0 +1,13 @@
+diff --git a/dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp b/dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp
+index 4536275..77651f9 100644
+--- a/dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp
++++ b/dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp
+@@ -32,7 +32,7 @@
+ #include <iomanip>
+ using namespace std;
+
+-#include <zip.h> // for saving compressed files
++#include <minizip/zip.h> // for saving compressed files
+ #ifdef _WIN32
+ #include <iowin32.h>
+ #else