From 2f49be85942382eb611101978bd680ef47f310ef Mon Sep 17 00:00:00 2001 From: Vladislav Nepogodin Date: Thu, 25 Jul 2024 01:40:19 +0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=91=B7=20build:=20update=20cpr=20depend?= =?UTF-8?q?=20and=20explicitly=20tell=20CTRE=20to=20use=20C++23=20standard?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 2 +- cmake/StandardProjectSettings.cmake | 4 ++++ subprojects/cpr.wrap | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 67a6e5c..8e9a6b2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,7 +62,7 @@ CPMAddPackage( CPMAddPackage( NAME cpr GITHUB_REPOSITORY libcpr/cpr - GIT_TAG 923f83a5946f8d276be757d7808101aafc900dd6 + GIT_TAG b5a21decc0cf25773fb5d742101da6b72639aa51 EXCLUDE_FROM_ALL YES ) CPMAddPackage( diff --git a/cmake/StandardProjectSettings.cmake b/cmake/StandardProjectSettings.cmake index 135da17..3c20732 100644 --- a/cmake/StandardProjectSettings.cmake +++ b/cmake/StandardProjectSettings.cmake @@ -28,6 +28,10 @@ set(SPDLOG_FMT_EXTERNAL ON CACHE INTERNAL "" FORCE) set(SPDLOG_DISABLE_DEFAULT_LOGGER ON CACHE INTERNAL "" FORCE) set(SIMDJSON_DISABLE_DEPRECATED_API ON CACHE INTERNAL "" FORCE) set(CPR_USE_SYSTEM_CURL ON CACHE INTERNAL "" FORCE) +# works only with libc++ so far +#set(CTRE_MODULE ON CACHE INTERNAL "" FORCE) +# for some reason CTRE doesnt respect CMAKE_CXX_STANDARD +set(CTRE_CXX_STANDARD 23 CACHE INTERNAL "" FORCE) # Generate compile_commands.json to make it easier to work with clang based tools set(CMAKE_EXPORT_COMPILE_COMMANDS ON) diff --git a/subprojects/cpr.wrap b/subprojects/cpr.wrap index b8062e5..96fefc5 100644 --- a/subprojects/cpr.wrap +++ b/subprojects/cpr.wrap @@ -1,6 +1,6 @@ [wrap-git] url = https://github.com/libcpr/cpr.git -revision = 923f83a5946f8d276be757d7808101aafc900dd6 +revision = b5a21decc0cf25773fb5d742101da6b72639aa51 patch_directory = cpr