From ba7bbaa2e96b9c3c2d1c459bc922c0829bf5e7fc Mon Sep 17 00:00:00 2001 From: gomkyung2 Date: Mon, 22 Jul 2024 02:12:06 +0900 Subject: [PATCH] WIP: Use vku with vcpkg overlays. --- .github/workflows/{triplets => }/clang-toolchain.cmake | 0 .github/workflows/linux.yml | 2 +- .github/workflows/{ => triplets}/x64-linux-clang.cmake | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename .github/workflows/{triplets => }/clang-toolchain.cmake (100%) rename .github/workflows/{ => triplets}/x64-linux-clang.cmake (61%) diff --git a/.github/workflows/triplets/clang-toolchain.cmake b/.github/workflows/clang-toolchain.cmake similarity index 100% rename from .github/workflows/triplets/clang-toolchain.cmake rename to .github/workflows/clang-toolchain.cmake diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 3801e78..19a8d36 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -46,7 +46,7 @@ jobs: -DCMAKE_TOOLCHAIN_FILE="$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake" \ -DVCPKG_OVERLAY_TRIPLETS=".github/workflows/triplets" \ -DVCPKG_TARGET_TRIPLET="x64-linux-clang" \ - -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=".github/workflows/triplets/clang-toolchain.cmake" \ + -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=".github/workflows/clang-toolchain.cmake" \ -DCMAKE_CXX_FLAGS="-stdlib=libc++" \ -DCMAKE_EXE_LINKER_FLAGS="-stdlib=libc++ -lc++abi" diff --git a/.github/workflows/x64-linux-clang.cmake b/.github/workflows/triplets/x64-linux-clang.cmake similarity index 61% rename from .github/workflows/x64-linux-clang.cmake rename to .github/workflows/triplets/x64-linux-clang.cmake index e65f6a6..3aa57b1 100644 --- a/.github/workflows/x64-linux-clang.cmake +++ b/.github/workflows/triplets/x64-linux-clang.cmake @@ -2,4 +2,4 @@ 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) \ No newline at end of file +set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE .github/workflows/clang-toolchain.cmake) \ No newline at end of file