diff options
| author | Curtis J Bezault <curtbezault@gmail.com> | 2019-08-15 10:03:54 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-15 10:03:54 -0700 |
| commit | 852e817462e40a299c935d31b4c1d6f17d4d3f74 (patch) | |
| tree | 0b0b5be87bc0f483e54dfd51e0612ff3b42b2164 | |
| parent | e236942061db0a03545c4b48fb6872667f2b8cc8 (diff) | |
| parent | 7291a25631b2097b961eae790ce90fbd4f8a6ca8 (diff) | |
| download | vcpkg-852e817462e40a299c935d31b4c1d6f17d4d3f74.tar.gz vcpkg-852e817462e40a299c935d31b4c1d6f17d4d3f74.zip | |
Merge pull request #7670 from PhoebeHui/dev/Phoebe/fixspdlog
[spdlog] fix cmake targets path
| -rw-r--r-- | ports/spdlog/CONTROL | 2 | ||||
| -rw-r--r-- | ports/spdlog/portfile.cmake | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/ports/spdlog/CONTROL b/ports/spdlog/CONTROL index aa5474709..0864d7858 100644 --- a/ports/spdlog/CONTROL +++ b/ports/spdlog/CONTROL @@ -1,5 +1,5 @@ Source: spdlog -Version: 1.3.1-1 +Version: 1.3.1-2 Homepage: https://github.com/gabime/spdlog Description: Very fast, header only, C++ logging library Build-Depends: fmt diff --git a/ports/spdlog/portfile.cmake b/ports/spdlog/portfile.cmake index 37cd8644f..d25f78712 100644 --- a/ports/spdlog/portfile.cmake +++ b/ports/spdlog/portfile.cmake @@ -27,7 +27,11 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/spdlog) +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/${PORT}") + vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +elseif(EXISTS "${CURRENT_PACKAGES_DIR}/lib/${PORT}/cmake") + vcpkg_fixup_cmake_targets(CONFIG_PATH lib/${PORT}/cmake) +endif() vcpkg_copy_pdbs() |