Set CMAKE_GENERATOR_TOOLSET

justsmth · justsmth · commit 4d390487ffb1 · 2024-07-01T23:33:35.000-04:00
diff --git a/aws-lc-sys/builder/cmake_builder.rs b/aws-lc-sys/builder/cmake_builder.rs
@@ -169,7 +169,8 @@ impl CmakeBuilder {
 
         // Only needed when cross-compiling
         if target_underscored() == "aarch64_pc_windows_msvc" {
-            cmake_cfg.generator("Ninja");
+            // https://stackoverflow.com/questions/64189111/how-to-use-clang-cl-llvm-with-vs2019-cmake
+            cmake_cfg.define("CMAKE_GENERATOR_TOOLSET", "ClangCL");
             cmake_cfg.define("CMAKE_ASM_COMPILER_TARGET", "arm64-pc-windows-msvc");
             cmake_cfg.define("CMAKE_ASM_COMPILER", "clang-cl");
         }

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,8 @@ impl CmakeBuilder {`
`169`	`169`
`170`	`170`	`// Only needed when cross-compiling`
`171`	`171`	`if target_underscored() == "aarch64_pc_windows_msvc" {`
`172`		`- cmake_cfg.generator("Ninja");`
	`172`	`+ // https://stackoverflow.com/questions/64189111/how-to-use-clang-cl-llvm-with-vs2019-cmake`
	`173`	`+ cmake_cfg.define("CMAKE_GENERATOR_TOOLSET", "ClangCL");`
`173`	`174`	`cmake_cfg.define("CMAKE_ASM_COMPILER_TARGET", "arm64-pc-windows-msvc");`
`174`	`175`	`cmake_cfg.define("CMAKE_ASM_COMPILER", "clang-cl");`
`175`	`176`	`}`