diff options
| author | João Maia <jpmmaia@gmail.com> | 2019-06-14 00:19:57 +0300 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-06-13 14:19:57 -0700 |
| commit | b03f62e0ebc1b5515bc8a1f41f3bfe9eca6589d4 (patch) | |
| tree | c5b886a29de18b187a469cd74b1725c8a042e739 | |
| parent | 7b41dc688a381e1701bd4dbe1ccf3c16d0979594 (diff) | |
| download | vcpkg-b03f62e0ebc1b5515bc8a1f41f3bfe9eca6589d4.tar.gz vcpkg-b03f62e0ebc1b5515bc8a1f41f3bfe9eca6589d4.zip | |
[assimp] Fix install assimp when passing --head (#6887)
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.
| -rw-r--r-- | ports/assimp/portfile.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ports/assimp/portfile.cmake b/ports/assimp/portfile.cmake index 95aefe020..559dd249c 100644 --- a/ports/assimp/portfile.cmake +++ b/ports/assimp/portfile.cmake @@ -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() |