diff options
| author | Phil Christensen <philc@microsoft.com> | 2018-12-04 14:05:12 -0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2018-12-04 14:05:12 -0800 |
| commit | e712374b2831c4d04fc3b37373ed5cf041a3713e (patch) | |
| tree | 3c1be3898e52d0e01cfc842be7ea553e8fe0bafb /ports/assimp | |
| parent | 7f80cbdeb02a126a610f3a3262eaefa9c9f9b938 (diff) | |
| parent | f6d32cc644a6f0fb9adb1bb3c3fd4905e8d61e2e (diff) | |
| download | vcpkg-e712374b2831c4d04fc3b37373ed5cf041a3713e.tar.gz vcpkg-e712374b2831c4d04fc3b37373ed5cf041a3713e.zip | |
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/philc/4889
Diffstat (limited to 'ports/assimp')
| -rw-r--r-- | ports/assimp/CONTROL | 4 | ||||
| -rw-r--r-- | ports/assimp/portfile.cmake | 11 |
2 files changed, 6 insertions, 9 deletions
diff --git a/ports/assimp/CONTROL b/ports/assimp/CONTROL index 8bb6f8105..fc52411f9 100644 --- a/ports/assimp/CONTROL +++ b/ports/assimp/CONTROL @@ -1,4 +1,4 @@ Source: assimp -Version: 4.1.0-2 +Version: 4.1.0-3 Description: The Open Asset import library -Build-Depends: zlib +Build-Depends: zlib, rapidjson diff --git a/ports/assimp/portfile.cmake b/ports/assimp/portfile.cmake index 66999122d..ecca87277 100644 --- a/ports/assimp/portfile.cmake +++ b/ports/assimp/portfile.cmake @@ -6,23 +6,20 @@ vcpkg_from_github( REF v4.1.0 SHA512 5f1292de873ae16c9921d1d44f2871474d74c0ddfd76cc928a7d9b3e03aa6eca4cc72af0513da20a86d09c55d48646e610fd4a4f2b05364f08ad09cf27cbc67a HEAD_REF master -) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} PATCHES - "${CMAKE_CURRENT_LIST_DIR}/dont-overwrite-prefix-path.patch" - "${CMAKE_CURRENT_LIST_DIR}/uninitialized-variable.patch" + dont-overwrite-prefix-path.patch + uninitialized-variable.patch ) file(REMOVE ${SOURCE_PATH}/cmake-modules/FindZLIB.cmake) -file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/zlib) +file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/zlib ${SOURCE_PATH}/contrib/gtest ${SOURCE_PATH}/contrib/rapidjson) set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -D_CRT_SECURE_NO_WARNINGS") set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS") vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -DASSIMP_BUILD_TESTS=OFF -DASSIMP_BUILD_ASSIMP_VIEW=OFF -DASSIMP_BUILD_ZLIB=OFF |