diff --git a/CMakeLists.txt b/CMakeLists.txt index bd49b2a..308dfc0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,10 +3,6 @@ cmake_minimum_required(VERSION 3.18) set(VCPKG_ROOT "vcpkg") set(CMAKE_TOOLCHAIN_FILE "${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" CACHE STRING "") -if(NOT DEFINED VCPKG_OVERLAY_TRIPLETS) - set(VCPKG_OVERLAY_TRIPLETS "${CMAKE_CURRENT_SOURCE_DIR}/cmake/triplets" CACHE STRING "") -endif() - set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_POSITION_INDEPENDENT_CODE ON) diff --git a/cmake/triplets/arm64-osx-custom.cmake b/cmake/triplets/arm64-osx.cmake similarity index 100% rename from cmake/triplets/arm64-osx-custom.cmake rename to cmake/triplets/arm64-osx.cmake diff --git a/cmake/triplets/x64-linux-custom.cmake b/cmake/triplets/x64-linux.cmake similarity index 100% rename from cmake/triplets/x64-linux-custom.cmake rename to cmake/triplets/x64-linux.cmake diff --git a/gen-linux-x64-debug.sh b/gen-linux-x64-debug.sh index 0c1e6af..1d60166 100755 --- a/gen-linux-x64-debug.sh +++ b/gen-linux-x64-debug.sh @@ -2,6 +2,4 @@ cmake -S . -B build/Debug \ -DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DVCPKG_TARGET_TRIPLET=x64-linux-custom \ - -DVCPKG_OVERLAY_TRIPLETS=cmake/triplets \ -G Ninja diff --git a/gen-linux-x64-release.sh b/gen-linux-x64-release.sh index e94ef3b..c8042ad 100755 --- a/gen-linux-x64-release.sh +++ b/gen-linux-x64-release.sh @@ -2,6 +2,4 @@ cmake -S . -B build/Release \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DVCPKG_TARGET_TRIPLET=x64-linux-custom \ - -DVCPKG_OVERLAY_TRIPLETS=cmake/triplets \ -G Ninja diff --git a/gen-osx-arm64-debug.sh b/gen-osx-arm64-debug.sh index b8de4f5..1d60166 100755 --- a/gen-osx-arm64-debug.sh +++ b/gen-osx-arm64-debug.sh @@ -2,6 +2,4 @@ cmake -S . -B build/Debug \ -DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DVCPKG_TARGET_TRIPLET=arm64-osx-custom \ - -DVCPKG_OVERLAY_TRIPLETS=cmake/triplets \ -G Ninja diff --git a/gen-osx-arm64-release.sh b/gen-osx-arm64-release.sh index c0dafc6..c8042ad 100755 --- a/gen-osx-arm64-release.sh +++ b/gen-osx-arm64-release.sh @@ -2,6 +2,4 @@ cmake -S . -B build/Release \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DVCPKG_TARGET_TRIPLET=arm64-osx-custom \ - -DVCPKG_OVERLAY_TRIPLETS=cmake/triplets \ -G Ninja diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json index dcfc401..9c48c30 100644 --- a/vcpkg-configuration.json +++ b/vcpkg-configuration.json @@ -1,4 +1,5 @@ { + "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg-configuration.schema.json", "default-registry": { "kind": "git", "repository": "https://github.com/microsoft/vcpkg", @@ -11,5 +12,8 @@ "baseline": "1f7b80aad8fed039d710b735bd0c038beef7b7ee", "packages": [ "firebird" ] } + ], + "overlay-triplets": [ + "cmake/triplets" ] }