3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-27 18:31:15 +08:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
it is possible to find the wrong zip.h when doing a full CI test.  Force it to
find the right one.
This commit is contained in:
Phil Christensen 2019-03-19 13:49:03 -07:00
parent 563ab882e1
commit fd0346372f
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ports/collada-dom/portfile.cmake
View File

@ -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(

13
ports/collada-dom/use-vcpkg-minizip.patch Normal file
View File

@ -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