evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make sure vcpkg is using clang

Browse Source
This commit is contained in:
Kae 2024-12-31 15:36:10 +11:00
parent 7b2ce5155a
commit 3a077eabeb
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/vcpkg-configuration.json
View File

@ -2,7 +2,7 @@
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg-configuration.schema.json", "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg-configuration.schema.json",
"default-registry": { "default-registry": {
"kind": "git", "kind": "git",
"baseline": "1de2026f28ead93ff1773e6e680387643e914ea1", "baseline": "b322364f06308bdd24823f9d8f03fe0cc86fd46f",
"repository": "https://github.com/microsoft/vcpkg" "repository": "https://github.com/microsoft/vcpkg"
} }
} }

2
toolchains/clang-toolchain.cmake Normal file
View File

@ -0,0 +1,2 @@
set(CMAKE_C_COMPILER "/usr/bin/clang")
set(CMAKE_CXX_COMPILER "/usr/bin/clang++")

1
triplets/x64-linux-mixed.cmake
View File

@ -3,6 +3,7 @@ set(VCPKG_CRT_LINKAGE dynamic)
set(VCPKG_LIBRARY_LINKAGE static) set(VCPKG_LIBRARY_LINKAGE static)
set(VCPKG_CMAKE_SYSTEM_NAME Linux) set(VCPKG_CMAKE_SYSTEM_NAME Linux)
set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE ${CMAKE_CURRENT_LIST_DIR}/../toolchains/clang-toolchain.cmake)
if(PORT MATCHES "discord-") if(PORT MATCHES "discord-")
set(VCPKG_LIBRARY_LINKAGE dynamic) set(VCPKG_LIBRARY_LINKAGE dynamic)