aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2017-10-18 03:54:19 -0700
committerGitHub <noreply@github.com>2017-10-18 03:54:19 -0700
commitabd2cd26e7992e8d859fad612a7ecacc14ce5364 (patch)
treec35fbbf8aa13b08e984c41755f5a6ddb1ed8f8af
parent2b41ebc75957d2e40036f52854af9f5cdd22b3a9 (diff)
parentbef18205d74d78b831ceb629c71b61836a012bf9 (diff)
downloadvcpkg-abd2cd26e7992e8d859fad612a7ecacc14ce5364.tar.gz
vcpkg-abd2cd26e7992e8d859fad612a7ecacc14ce5364.zip
Merge pull request #2007 from kypp/assimp
[assimp] fix static linkage and update version
-rw-r--r--ports/assimp/CONTROL2
-rw-r--r--ports/assimp/portfile.cmake5
2 files changed, 4 insertions, 3 deletions
diff --git a/ports/assimp/CONTROL b/ports/assimp/CONTROL
index f13d2ee20..170d727a8 100644
--- a/ports/assimp/CONTROL
+++ b/ports/assimp/CONTROL
@@ -1,4 +1,4 @@
Source: assimp
-Version: 4.0.0-2
+Version: 4.0.1
Description: The Open Asset import library
Build-Depends: zlib
diff --git a/ports/assimp/portfile.cmake b/ports/assimp/portfile.cmake
index 14564e65a..0642fb701 100644
--- a/ports/assimp/portfile.cmake
+++ b/ports/assimp/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO assimp/assimp
- REF v4.0.0
- SHA512 ab2b376c6323fc8579fe3a4b3dbe92c44d753747464a14d6e2be70d2a855c208df882ad84487a7b96f364afb175938b5f6a1111d767450b01e0b8b7f0f36ba62
+ REF v4.0.1
+ SHA512 260b4c7e738f857d8364c4878ea4e789ca676180821943f6d9bff8f56e5f9377ea29660dca4e130c681a8aa12fc32f155adb1d78ca260ba242e68b8afa6cc1bb
HEAD_REF master
)
@@ -19,6 +19,7 @@ vcpkg_configure_cmake(
-DASSIMP_BUILD_ASSIMP_VIEW=False
-DASSIMP_BUILD_ZLIB=False
-DASSIMP_BUILD_ASSIMP_TOOLS=False
+ -DASSIMP_INSTALL_PDB=False
)
vcpkg_install_cmake()