mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-12 02:01:39 +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
445 B
Diff
17 lines
445 B
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index dca534962d..bf02ea3425 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -142,7 +142,11 @@ if(BOOST_CONTEXT_IMPLEMENTATION STREQUAL "fcontext")
|
|
enable_language(ASM)
|
|
endif()
|
|
elseif(BOOST_CONTEXT_ASSEMBLER STREQUAL armasm)
|
|
+ if(MSVC)
|
|
+ enable_language(ASM_MARMASM)
|
|
+ else()
|
|
enable_language(ASM_ARMASM)
|
|
+ endif()
|
|
else()
|
|
enable_language(ASM_MASM)
|
|
endif()
|