add a llvm x86 triplet

Neumann-A · Feb 19, 2023 · 894ec02 · 894ec02
1 parent 6266231
commit 894ec02
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 2 deletions.
diff --git a/x64-win-llvm/x64-win-llvm.toolchain.cmake b/x64-win-llvm/x64-win-llvm.toolchain.cmake
@@ -32,7 +32,10 @@ set(std_c_flags "-std:c11 -D__STDC__=1") #/Zc:__STDC__
 #set(std_cxx_flags "/permissive- -std:c++14 /Zc:__cplusplus")
 
 # Set Windows definitions:
-set(windows_defs "/DWIN32 /D_WIN64")
+set(windows_defs "/DWIN32")
+if(VCPKG_TARGET_ARCHITECTURE STREQUAL x64)
+  string(APPEND windows_defs " /D_WIN64")
+endif()
 string(APPEND windows_defs " /D_WIN32_WINNT=0x0A00 /DWINVER=0x0A00") # tweak for targeted windows
 string(APPEND windows_defs " /D_CRT_SECURE_NO_DEPRECATE /D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_DEPRECATE")
 string(APPEND windows_defs " /D_ATL_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_WARNINGS")
@@ -48,7 +51,9 @@ set(arch_flags "-mcrc32 -msse4.2")
 # -mcrc32 for libpq
 # -mrtm for tbb (will break qtdeclarative since it cannot run the executables in CI)
 # -msse4.2 for everything which normally cl can use. (Otherwise strict sse2 only.)
-
+if(VCPKG_TARGET_ARCHITECTURE STREQUAL x86)
+  string(APPEND arch_flags " -m32 --target=i686-pc-windows-msvc")
+endif()
 # /Za unknown
 
 # Set runtime library.

diff --git a/x86-win-llvm.cmake b/x86-win-llvm.cmake
@@ -0,0 +1,23 @@
+# This triplet is tested in vcpkg ci via https://github.com/microsoft/vcpkg/pull/25897
+set(VCPKG_TARGET_ARCHITECTURE x86)
+set(VCPKG_CRT_LINKAGE dynamic)
+set(VCPKG_LIBRARY_LINKAGE dynamic)
+
+## Toolchain setup
+set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/x64-win-llvm/x64-win-llvm.toolchain.cmake")
+set(VCPKG_LOAD_VCVARS_ENV ON) # Setting VCPKG_CHAINLOAD_TOOLCHAIN_FILE deactivates automatic vcvars setup so reenable it!
+
+if(DEFINED VCPKG_PLATFORM_TOOLSET) # Tricks vcpkg to load vcvars for a VCPKG_PLATFORM_TOOLSET which is not vc14[0-9]
+    set(VCPKG_PLATFORM_TOOLSET ClangCL)
+endif()
+set(VCPKG_ENV_PASSTHROUGH_UNTRACKED "LLVMInstallDir;LLVMToolsVersion") # For the ClangCL toolset
+set(VCPKG_QT_TARGET_MKSPEC win32-clang-msvc) # For Qt5
+
+## Policy settings
+set(VCPKG_POLICY_SKIP_ARCHITECTURE_CHECK enabled)
+set(VCPKG_POLICY_SKIP_DUMPBIN_CHECKS enabled)
+
+## Extra scripts which should not directly be hashed so that changes don't nuke the complete installed tree in manifest mode
+## Note: This breaks binary caching so don't apply changes to these files unkowningly. 
+include("${CMAKE_CURRENT_LIST_DIR}/x64-win-llvm/extra_setup.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/x64-win-llvm/port_specialization.cmake")