diff options
| -rw-r--r-- | source/vcpkg-configuration.json | 2 | ||||
| -rw-r--r-- | toolchains/clang-toolchain.cmake | 2 | ||||
| -rw-r--r-- | triplets/x64-linux-mixed.cmake | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/source/vcpkg-configuration.json b/source/vcpkg-configuration.json index 98aa608..9d30be2 100644 --- a/source/vcpkg-configuration.json +++ b/source/vcpkg-configuration.json @@ -2,7 +2,7 @@ "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg-configuration.schema.json", "default-registry": { "kind": "git", - "baseline": "1de2026f28ead93ff1773e6e680387643e914ea1", + "baseline": "b322364f06308bdd24823f9d8f03fe0cc86fd46f", "repository": "https://github.com/microsoft/vcpkg" } } diff --git a/toolchains/clang-toolchain.cmake b/toolchains/clang-toolchain.cmake new file mode 100644 index 0000000..38a8d38 --- /dev/null +++ b/toolchains/clang-toolchain.cmake @@ -0,0 +1,2 @@ +set(CMAKE_C_COMPILER "/usr/bin/clang") +set(CMAKE_CXX_COMPILER "/usr/bin/clang++")
\ No newline at end of file diff --git a/triplets/x64-linux-mixed.cmake b/triplets/x64-linux-mixed.cmake index be80364..5e93dff 100644 --- a/triplets/x64-linux-mixed.cmake +++ b/triplets/x64-linux-mixed.cmake @@ -3,6 +3,7 @@ set(VCPKG_CRT_LINKAGE dynamic) set(VCPKG_LIBRARY_LINKAGE static) set(VCPKG_CMAKE_SYSTEM_NAME Linux) +set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE ${CMAKE_CURRENT_LIST_DIR}/../toolchains/clang-toolchain.cmake) if(PORT MATCHES "discord-") set(VCPKG_LIBRARY_LINKAGE dynamic) |