diff options
| author |  buttercat1791 <mjjurkoic@gmail.com> | 2024-05-27 22:46:27 -0500 |
|---|---|---|
| committer | buttercat1791 <mjjurkoic@gmail.com> | 2024-05-27 22:46:27 -0500 |
| commit | 564a8ee70699fb44437d73f4c310cd37481da21b (patch) | |
| tree | 9a336fb55773ec59296ede9473c28df3406e2022 | |
| parent | 32bb72b527966c1b7324afcd7fae466fc84b30d6 (diff) | |
Require vcpkg manifest mode
| -rw-r--r-- | CMakeLists.txt | 9 | ||||
| -rw-r--r-- | CMakePresets.json | 8 |
2 files changed, 12 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4ae3b1d..b2915c9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,9 @@ cmake_minimum_required(VERSION 3.19) -cmake_policy(SET CMP0135 NEW) -project(aedile VERSION 0.0.2) +project(aedile VERSION 0.0.3) + +if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.24") + cmake_policy(SET CMP0135 NEW) +endif() include(ExternalProject) include(FetchContent) @@ -54,7 +57,7 @@ include_directories(${uuid_v4_SOURCE_DIR}) FetchContent_Declare( libnoscrypt GIT_REPOSITORY git@github.com:VnUgE/noscrypt.git - GIT_TAG d09d9330415d463ca19be9394b02ce11b3366f7e + GIT_TAG 72e1b7be4031e2fd4d258fcf434ad049c0029201 ) FetchContent_MakeAvailable(libnoscrypt) diff --git a/CMakePresets.json b/CMakePresets.json index 84c0aff..fab41e3 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -7,7 +7,9 @@ "binaryDir": "${sourceDir}/build/linux", "cacheVariables": { "CMAKE_BUILD_TYPE": "Release", - "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" + "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake", + "VCPKG_MANIFEST_MODE": "ON", + "VCPKG_TARGET_TRIPLET": "x64-linux" } }, { @@ -15,9 +17,11 @@ "generator": "Unix Makefiles", "binaryDir": "${sourceDir}/build/linux", "cacheVariables": { + "AEDILE_INCLUDE_TESTS": "ON", "CMAKE_BUILD_TYPE": "Release", "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake", - "AEDILE_INCLUDE_TESTS": "ON" + "VCPKG_MANIFEST_MODE": "ON", + "VCPKG_TARGET_TRIPLET": "x64-linux" } } ], |