WIP: Use vku with vcpkg overlays.

stripe2933 · Jul 21, 2024 · 64d3cba · 64d3cba
1 parent 964fcde
commit 64d3cba
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -44,7 +44,9 @@ jobs:
             -DCMAKE_CXX_COMPILER="/usr/bin/clang++-18" \
             -DCMAKE_BUILD_TYPE=Release \
             -DCMAKE_TOOLCHAIN_FILE="$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake" \
-            -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=".github/workflows/x64-linux-clang.cmake" \
+            -DVCPKG_OVERLAY_TRIPLETS=".github/workflows/triplets" \
+            -DVCPKG_TARGET_TRIPLET="x64-linux-clang" \
+            -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=".github/workflows/triplets/clang-toolchain.cmake" \
             -DCMAKE_CXX_FLAGS="-stdlib=libc++" \
             -DCMAKE_EXE_LINKER_FLAGS="-stdlib=libc++ -lc++abi"
 

diff --git a/.github/workflows/triplets/clang-toolchain.cmake b/.github/workflows/triplets/clang-toolchain.cmake
@@ -0,0 +1,2 @@
+set(CMAKE_C_COMPILER /usr/bin/clang-18)
+set(CMAKE_CXX_COMPILER /usr/bin/clang++-18)
diff --git a/.github/workflows/x64-linux-clang.cmake b/.github/workflows/x64-linux-clang.cmake
@@ -1,2 +1,5 @@
-set(CMAKE_C_COMPILER /usr/bin/clang-18)
-set(CMAKE_CXX_COMPILER /usr/bin/clang++-18)
+set(VCPKG_TARGET_ARCHITECTURE x64)
+set(VCPKG_CRT_LINKAGE static)
+set(VCPKG_LIBRARY_LINKAGE static)
+set(VCPKG_CMAKE_SYSTEM_NAME Linux)
+set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE .github/workflows/triplets/clang-toolchain.cmake)