diff options
| author | Bradley Austin Davis <bdavis@saintandreas.org> | 2019-10-18 14:08:24 -0700 |
|---|---|---|
| committer | Victor Romero <romerosanchezv@gmail.com> | 2019-10-18 14:08:24 -0700 |
| commit | 01ab11a6f5275a309f49a449312f5294914692d8 (patch) | |
| tree | 12ed7cfef2e9956b0688c1f6394199b83caed544 | |
| parent | ff9a7c8f54be4e21fe9187c76478e34beeba5014 (diff) | |
| download | vcpkg-01ab11a6f5275a309f49a449312f5294914692d8.tar.gz vcpkg-01ab11a6f5275a309f49a449312f5294914692d8.zip | |
[assimp] Fix cmake package config (#8665)
| -rw-r--r-- | ports/assimp/CONTROL | 2 | ||||
| -rw-r--r-- | ports/assimp/cmake-policy.patch | 13 | ||||
| -rw-r--r-- | ports/assimp/portfile.cmake | 1 |
3 files changed, 15 insertions, 1 deletions
diff --git a/ports/assimp/CONTROL b/ports/assimp/CONTROL index 2de26f9b9..ba4a89980 100644 --- a/ports/assimp/CONTROL +++ b/ports/assimp/CONTROL @@ -1,5 +1,5 @@ Source: assimp
-Version: 5.0.0
+Version: 5.0.0-1
Homepage: https://github.com/assimp/assimp
Description: The Open Asset import library
Build-Depends: zlib, rapidjson
diff --git a/ports/assimp/cmake-policy.patch b/ports/assimp/cmake-policy.patch new file mode 100644 index 000000000..e8d681ed8 --- /dev/null +++ b/ports/assimp/cmake-policy.patch @@ -0,0 +1,13 @@ +diff --git a/assimpTargets.cmake.in b/assimpTargets.cmake.in +index ab1a8d2c..4b0729be 100644 +--- a/assimpTargets.cmake.in ++++ b/assimpTargets.cmake.in +@@ -5,6 +5,8 @@ if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5) + endif() + cmake_policy(PUSH) + cmake_policy(VERSION 2.6) ++# Required for the evaluation of "if(@BUILD_SHARED_LIBS@)" below to function ++cmake_policy(SET CMP0012 NEW) + #---------------------------------------------------------------- + # Generated CMake target import file. + #---------------------------------------------------------------- diff --git a/ports/assimp/portfile.cmake b/ports/assimp/portfile.cmake index df6850d08..07c0534e8 100644 --- a/ports/assimp/portfile.cmake +++ b/ports/assimp/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( PATCHES uninitialized-variable.patch fix-static-build-error.patch + cmake-policy.patch ) file(REMOVE ${SOURCE_PATH}/cmake-modules/FindZLIB.cmake) |