From 6df06684bc6322a3ca15b254b0d1348626553e51 Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Wed, 11 Dec 2024 10:52:45 +0100 Subject: [PATCH] fixes project setup --- .cproject | 29 ++++++++++++++--------------- CMakePresets.json | 15 +++------------ cmake-conan | 2 +- 3 files changed, 18 insertions(+), 28 deletions(-) diff --git a/.cproject b/.cproject index 88b07a7..fea828d 100644 --- a/.cproject +++ b/.cproject @@ -28,10 +28,9 @@ - - + + - @@ -106,8 +105,8 @@ - - + + @@ -119,22 +118,22 @@ - - - - - - - - + + + + + + + + - - + + diff --git a/CMakePresets.json b/CMakePresets.json index d2c6882..86840c3 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -15,16 +15,7 @@ "CMAKE_POLICY_DEFAULT_CMP0091": "NEW", "CMAKE_BUILD_TYPE": "Debug", "CMAKE_CXX_STANDARD": "17", - "CMAKE_PROJECT_TOP_LEVEL_INCLUDES":"cmake-conan/conan_provider.cmake" - } - }, - { - "name": "DebugCXX11", - "cacheVariables": { - "CMAKE_POLICY_DEFAULT_CMP0091": "NEW", - "CMAKE_BUILD_TYPE": "Debug", - "CMAKE_CXX_STANDARD": "11", - "CMAKE_PROJECT_TOP_LEVEL_INCLUDES":"cmake-conan/conan_provider.cmake" + "CMAKE_PROJECT_TOP_LEVEL_INCLUDES": "cmake-conan/conan_provider.cmake" } }, { @@ -33,7 +24,7 @@ "CMAKE_POLICY_DEFAULT_CMP0091": "NEW", "CMAKE_BUILD_TYPE": "RelWithDebInfo", "CMAKE_CXX_STANDARD": "17", - "CMAKE_PROJECT_TOP_LEVEL_INCLUDES":"cmake-conan/conan_provider.cmake" + "CMAKE_PROJECT_TOP_LEVEL_INCLUDES": "cmake-conan/conan_provider.cmake" } }, { @@ -42,7 +33,7 @@ "CMAKE_POLICY_DEFAULT_CMP0091": "NEW", "CMAKE_BUILD_TYPE": "Release", "CMAKE_CXX_STANDARD": "17", - "CMAKE_PROJECT_TOP_LEVEL_INCLUDES":"cmake-conan/conan_provider.cmake" + "CMAKE_PROJECT_TOP_LEVEL_INCLUDES": "cmake-conan/conan_provider.cmake" } } ] diff --git a/cmake-conan b/cmake-conan index eba63de..c22bbf0 160000 --- a/cmake-conan +++ b/cmake-conan @@ -1 +1 @@ -Subproject commit eba63de908a994299731b49e8c84dc3d1da7896e +Subproject commit c22bbf0af0b73d5f0def24a9cdf4ce503ae79e5d