mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-28 03:46:38 +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>
25 lines
716 B
Diff
25 lines
716 B
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index c0c1bfef94..3c879b8958 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -17,7 +17,7 @@ target_link_libraries(boost_process
|
|
Boost::asio
|
|
Boost::config
|
|
Boost::core
|
|
- Boost::filesystem
|
|
+ $<TARGET_NAME_IF_EXISTS:Boost::filesystem>
|
|
Boost::fusion
|
|
Boost::iterator
|
|
Boost::move
|
|
@@ -28,6 +28,10 @@ target_link_libraries(boost_process
|
|
Boost::winapi
|
|
)
|
|
|
|
+if(NOT TARGET Boost::filesystem)
|
|
+ target_compile_definitions(boost_process INTERFACE $<$<NOT:$<TARGET_EXISTS:Boost::filesystem>>:BOOST_PROCESS_USE_STD_FS>)
|
|
+endif()
|
|
+
|
|
if(BUILD_TESTING AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt")
|
|
|
|
add_subdirectory(test)
|