Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade assimp to v4.1.0 #2364

Merged
merged 3 commits into from
Dec 13, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/assimp/CONTROL
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Source: assimp
Version: 4.0.1-3
Version: 4.1.0
Description: The Open Asset import library
Build-Depends: zlib
15 changes: 0 additions & 15 deletions ports/assimp/const-compare-worditerator.patch

This file was deleted.

7 changes: 3 additions & 4 deletions ports/assimp/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,14 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO assimp/assimp
REF v4.0.1
SHA512 260b4c7e738f857d8364c4878ea4e789ca676180821943f6d9bff8f56e5f9377ea29660dca4e130c681a8aa12fc32f155adb1d78ca260ba242e68b8afa6cc1bb
REF v4.1.0
SHA512 5f1292de873ae16c9921d1d44f2871474d74c0ddfd76cc928a7d9b3e03aa6eca4cc72af0513da20a86d09c55d48646e610fd4a4f2b05364f08ad09cf27cbc67a
HEAD_REF master
)

vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES
"${CMAKE_CURRENT_LIST_DIR}/const-compare-worditerator.patch"
"${CMAKE_CURRENT_LIST_DIR}/dont-overwrite-prefix-path.patch"
)

Expand All @@ -30,7 +29,7 @@ vcpkg_configure_cmake(

vcpkg_install_cmake()

vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/assimp-4.0")
vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/assimp-4.1")

vcpkg_copy_pdbs()

Expand Down