diff options
| author | ras0219 <533828+ras0219@users.noreply.github.com> | 2020-09-09 20:40:15 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-09 20:40:15 -0700 |
| commit | f6df03b4a819bf78bc0cdf8b2369ffffc44cd894 (patch) | |
| tree | ae3b16c8082f8202e9a01004e4b17cfdcfd52658 /ports/assimp/fix_minizip.patch | |
| parent | 32b6c3a134022db7b985ed5f7d1f2ff13a96a140 (diff) | |
| download | vcpkg-f6df03b4a819bf78bc0cdf8b2369ffffc44cd894.tar.gz vcpkg-f6df03b4a819bf78bc0cdf8b2369ffffc44cd894.zip | |
[assimp][irrxml][kubazip][poly2tri][polyclipping] Extract vendored dependencies (#13264)
* [assimp] Fix -config.cmake files
* [assimp] Fix linux build and provide backwards-compatible alias
* [assimp][irrxml][kubazip][poly2tri][polyclipping] Extract vendored dependencies
* [assimp] Use find_dependency(); add ZLIB dependency
* [polyclipping] Do not suffix upstream binaries
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Co-authored-by: Stefano Sinigardi <stesinigardi@hotmail.com>
Diffstat (limited to 'ports/assimp/fix_minizip.patch')
| -rw-r--r-- | ports/assimp/fix_minizip.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/ports/assimp/fix_minizip.patch b/ports/assimp/fix_minizip.patch deleted file mode 100644 index a0207ebe6..000000000 --- a/ports/assimp/fix_minizip.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6c3d03e..4cb6927 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -470,12 +470,12 @@ ENDIF(HUNTER_ENABLED)
-
- IF( NOT IOS )
- IF( NOT ASSIMP_BUILD_MINIZIP )
-- use_pkgconfig(UNZIP minizip)
-+ find_package(minizip CONFIG REQUIRED)
- ENDIF( NOT ASSIMP_BUILD_MINIZIP )
- ELSE ( NOT IOS )
- IF( NOT BUILD_SHARED_LIBS )
- IF( NOT ASSIMP_BUILD_MINIZIP )
-- use_pkgconfig(UNZIP minizip)
-+ find_package(minizip CONFIG REQUIRED)
- ENDIF( NOT ASSIMP_BUILD_MINIZIP )
- ENDIF ( NOT BUILD_SHARED_LIBS )
- ENDIF ( NOT IOS )
-diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
-index 55538d9..30568ff 100644
---- a/code/CMakeLists.txt
-+++ b/code/CMakeLists.txt
-@@ -1125,7 +1125,7 @@ IF(HUNTER_ENABLED)
- zip::zip
- )
- ELSE(HUNTER_ENABLED)
-- TARGET_LINK_LIBRARIES(assimp ${ZLIB_LIBRARIES} ${OPENDDL_PARSER_LIBRARIES} ${IRRXML_LIBRARY} )
-+ TARGET_LINK_LIBRARIES(assimp ${ZLIB_LIBRARIES} ${OPENDDL_PARSER_LIBRARIES} ${IRRXML_LIBRARY} minizip::minizip)
- ENDIF(HUNTER_ENABLED)
-
- if(ASSIMP_ANDROID_JNIIOSYSTEM)
|