mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-04 15:02:47 +08:00
bcf3d00d21
~~arm64-windows: boost-context builds are blocked by a cmake bug (see https://gitlab.kitware.com/cmake/cmake/-/issues/24317)~~ closes #32274 closes https://github.com/Neumann-A/my-vcpkg-triplets/issues/5 Questions: - [x] ~~Move cmake files to `share/cmake/<name>` ?~~ Not doing it because it is just using `vcpkg_cmake_config_fixup()` - [x] Fix weak dependencies (uwp|emscripten|android|arm)? - [x] Fix library names on !x64 (currently hardcoded to x64 or x86; failure in aricpp since it forces FindBoost module mode.) - [x] ~~Fix arm64-windows boost-context builds -> requires CMake (3.19.2?) update due to bug how the assembler is invoked.~~ (-> CI baseline for now) TODO: - [x] adjust generate ports script - [x] #37457 --------- Co-authored-by: Cheney-Wang <850426846@qq.com>
17 lines
646 B
Diff
17 lines
646 B
Diff
diff --git a/include/BoostInstall.cmake b/include/BoostInstall.cmake
|
|
index 49c0086fea..d5403a19e7 100644
|
|
--- a/include/BoostInstall.cmake
|
|
+++ b/include/BoostInstall.cmake
|
|
@@ -332,9 +332,9 @@ function(boost_install_target)
|
|
|
|
string(APPEND CONFIG_FILE_CONTENTS "find_dependency(LibLZMA)\n")
|
|
|
|
- elseif(dep STREQUAL "zstd::libzstd_shared" OR dep STREQUAL "zstd::libzstd_static")
|
|
+ elseif(dep MATCHES "zstd::libzstd_(shared|static)")
|
|
|
|
- string(APPEND CONFIG_FILE_CONTENTS "find_dependency(zstd)\n")
|
|
+ string(APPEND CONFIG_FILE_CONTENTS "find_dependency(zstd CONFIG)\n")
|
|
|
|
elseif(dep STREQUAL "MPI::MPI_C")
|
|
|