diff --git a/CMakePresets.json b/CMakePresets.json index b83003a9ba0..940e694f1d2 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -16,7 +16,8 @@ "CMAKE_BUILD_TYPE": "RelWithDebInfo", "SERENITY_CACHE_DIR": "${sourceDir}/Build/caches", "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/Toolchain/Tarballs/vcpkg/scripts/buildsystems/vcpkg.cmake", - "VCPKG_INSTALL_OPTIONS": "--no-print-usage" + "VCPKG_INSTALL_OPTIONS": "--no-print-usage", + "VCPKG_OVERLAY_TRIPLETS": "${sourceDir}/Meta/CMake/vcpkg/release-triplets" }, "environment": { "LADYBIRD_SOURCE_DIR": "${sourceDir}", diff --git a/Meta/CMake/vcpkg/base-triplets/arm64-osx.cmake b/Meta/CMake/vcpkg/base-triplets/arm64-osx.cmake new file mode 100644 index 00000000000..56633d834f2 --- /dev/null +++ b/Meta/CMake/vcpkg/base-triplets/arm64-osx.cmake @@ -0,0 +1,4 @@ +set(VCPKG_CMAKE_SYSTEM_NAME Darwin) +set(VCPKG_TARGET_ARCHITECTURE arm64) +set(VCPKG_OSX_ARCHITECTURES arm64) +set(VCPKG_CRT_LINKAGE dynamic) diff --git a/Meta/CMake/vcpkg/base-triplets/x64-linux.cmake b/Meta/CMake/vcpkg/base-triplets/x64-linux.cmake new file mode 100644 index 00000000000..d8eb6a0969b --- /dev/null +++ b/Meta/CMake/vcpkg/base-triplets/x64-linux.cmake @@ -0,0 +1,3 @@ +set(VCPKG_CMAKE_SYSTEM_NAME Linux) +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_CRT_LINKAGE dynamic) diff --git a/Meta/CMake/vcpkg/base-triplets/x64-osx.cmake b/Meta/CMake/vcpkg/base-triplets/x64-osx.cmake new file mode 100644 index 00000000000..80e1a25c406 --- /dev/null +++ b/Meta/CMake/vcpkg/base-triplets/x64-osx.cmake @@ -0,0 +1,4 @@ +set(VCPKG_CMAKE_SYSTEM_NAME Darwin) +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_OSX_ARCHITECTURES x86_64) +set(VCPKG_CRT_LINKAGE dynamic) diff --git a/Meta/CMake/vcpkg/release-triplets/arm64-osx.cmake b/Meta/CMake/vcpkg/release-triplets/arm64-osx.cmake new file mode 100644 index 00000000000..83ba793a277 --- /dev/null +++ b/Meta/CMake/vcpkg/release-triplets/arm64-osx.cmake @@ -0,0 +1,2 @@ +include (${CMAKE_CURRENT_LIST_DIR}/../base-triplets/arm64-osx.cmake) +include (${CMAKE_CURRENT_LIST_DIR}/release.cmake) diff --git a/Meta/CMake/vcpkg/release-triplets/release.cmake b/Meta/CMake/vcpkg/release-triplets/release.cmake new file mode 100644 index 00000000000..d19538159a8 --- /dev/null +++ b/Meta/CMake/vcpkg/release-triplets/release.cmake @@ -0,0 +1,2 @@ +set(VCPKG_BUILD_TYPE release) +set(VCPKG_LIBRARY_LINKAGE static) diff --git a/Meta/CMake/vcpkg/release-triplets/x64-linux.cmake b/Meta/CMake/vcpkg/release-triplets/x64-linux.cmake new file mode 100644 index 00000000000..925fcce8da2 --- /dev/null +++ b/Meta/CMake/vcpkg/release-triplets/x64-linux.cmake @@ -0,0 +1,2 @@ +include (${CMAKE_CURRENT_LIST_DIR}/../base-triplets/x64-linux.cmake) +include (${CMAKE_CURRENT_LIST_DIR}/release.cmake) diff --git a/Meta/CMake/vcpkg/release-triplets/x64-osx.cmake b/Meta/CMake/vcpkg/release-triplets/x64-osx.cmake new file mode 100644 index 00000000000..1f2d8592222 --- /dev/null +++ b/Meta/CMake/vcpkg/release-triplets/x64-osx.cmake @@ -0,0 +1,2 @@ +include (${CMAKE_CURRENT_LIST_DIR}/../base-triplets/x64-osx.cmake) +include (${CMAKE_CURRENT_LIST_DIR}/release.cmake) diff --git a/Meta/CMake/vcpkg/sanitizer-triplets/arm64-osx.cmake b/Meta/CMake/vcpkg/sanitizer-triplets/arm64-osx.cmake index d25fb9a6dae..8d7d1ea9a7e 100644 --- a/Meta/CMake/vcpkg/sanitizer-triplets/arm64-osx.cmake +++ b/Meta/CMake/vcpkg/sanitizer-triplets/arm64-osx.cmake @@ -1,9 +1,2 @@ -set(VCPKG_TARGET_ARCHITECTURE arm64) -set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE static) - -set(VCPKG_CMAKE_SYSTEM_NAME Darwin) -set(VCPKG_OSX_ARCHITECTURES arm64) - -set(VCPKG_C_FLAGS "") -set(VCPKG_CXX_FLAGS "-frtti") +include (${CMAKE_CURRENT_LIST_DIR}/../base-triplets/arm64-osx.cmake) +include (${CMAKE_CURRENT_LIST_DIR}/sanitizer.cmake) diff --git a/Meta/CMake/vcpkg/sanitizer-triplets/sanitizer.cmake b/Meta/CMake/vcpkg/sanitizer-triplets/sanitizer.cmake new file mode 100644 index 00000000000..b0ebad018f9 --- /dev/null +++ b/Meta/CMake/vcpkg/sanitizer-triplets/sanitizer.cmake @@ -0,0 +1,4 @@ +set(VCPKG_LIBRARY_LINKAGE static) + +set(VCPKG_C_FLAGS "") +set(VCPKG_CXX_FLAGS "-frtti") diff --git a/Meta/CMake/vcpkg/sanitizer-triplets/x64-linux.cmake b/Meta/CMake/vcpkg/sanitizer-triplets/x64-linux.cmake index 1bf7c7990ea..ab24df231c5 100644 --- a/Meta/CMake/vcpkg/sanitizer-triplets/x64-linux.cmake +++ b/Meta/CMake/vcpkg/sanitizer-triplets/x64-linux.cmake @@ -1,8 +1,2 @@ -set(VCPKG_TARGET_ARCHITECTURE x64) -set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE static) - -set(VCPKG_CMAKE_SYSTEM_NAME Linux) - -set(VCPKG_C_FLAGS "") -set(VCPKG_CXX_FLAGS "-frtti") +include (${CMAKE_CURRENT_LIST_DIR}/../base-triplets/x64-linux.cmake) +include (${CMAKE_CURRENT_LIST_DIR}/sanitizer.cmake) diff --git a/Meta/CMake/vcpkg/sanitizer-triplets/x64-osx.cmake b/Meta/CMake/vcpkg/sanitizer-triplets/x64-osx.cmake index 70251f2674d..107a891f231 100644 --- a/Meta/CMake/vcpkg/sanitizer-triplets/x64-osx.cmake +++ b/Meta/CMake/vcpkg/sanitizer-triplets/x64-osx.cmake @@ -1,9 +1,2 @@ -set(VCPKG_TARGET_ARCHITECTURE x64) -set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE static) - -set(VCPKG_CMAKE_SYSTEM_NAME Darwin) -set(VCPKG_OSX_ARCHITECTURES x86_64) - -set(VCPKG_C_FLAGS "") -set(VCPKG_CXX_FLAGS "-frtti") +include (${CMAKE_CURRENT_LIST_DIR}/../base-triplets/x64-osx.cmake) +include (${CMAKE_CURRENT_LIST_DIR}/sanitizer.cmake)