diff options
| author | Phil Christensen <philc@microsoft.com> | 2019-03-19 13:49:03 -0700 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-03-19 13:49:03 -0700 |
| commit | fd0346372fab12a6925a4c243f2b19b713699d12 (patch) | |
| tree | b4e65105c36d33ffaa12d27f6bee8f426db1cb1c | |
| parent | 563ab882e1fdb45a851b03d56f4c8d18cf00d7ec (diff) | |
| download | vcpkg-fd0346372fab12a6925a4c243f2b19b713699d12.tar.gz vcpkg-fd0346372fab12a6925a4c243f2b19b713699d12.zip | |
[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.
| -rw-r--r-- | ports/collada-dom/portfile.cmake | 5 | ||||
| -rw-r--r-- | ports/collada-dom/use-vcpkg-minizip.patch | 13 |
2 files changed, 16 insertions, 2 deletions
diff --git a/ports/collada-dom/portfile.cmake b/ports/collada-dom/portfile.cmake index 2612eca68..eda714af1 100644 --- 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 new file mode 100644 index 000000000..daaaf0f48 --- /dev/null +++ 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
|