Skip to content

Commit

Permalink
[assimp] Fix install assimp when passing --head (microsoft#6887)
Browse files Browse the repository at this point in the history
Instead of using hardcoded `assimp-4.1` folder, check directories with pattern `assimp-*` and select the first one. This fixes `vcpkg install vcpkg --head`, since the latest version creates a folder named `assimp-5.0` instead.
  • Loading branch information
JPMMaia authored and Rastaban committed Jun 13, 2019
1 parent 7b41dc6 commit b03f62e
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion ports/assimp/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ vcpkg_configure_cmake(

vcpkg_install_cmake()

vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/assimp-4.1")
FILE(GLOB lib_cmake_directories RELATIVE "${CURRENT_PACKAGES_DIR}" "${CURRENT_PACKAGES_DIR}/lib/cmake/assimp-*")
list(GET lib_cmake_directories 0 lib_cmake_directory)
vcpkg_fixup_cmake_targets(CONFIG_PATH "${lib_cmake_directory}")

vcpkg_copy_pdbs()

Expand Down

0 comments on commit b03f62e

Please sign in to comment.