From 08c0571647ee882f84bb5ae7b900492f2732f444 Mon Sep 17 00:00:00 2001 From: Paul Date: Tue, 7 Nov 2023 19:54:22 +0100 Subject: [PATCH 1/2] cmake presets ordering important aka fix ninja builds --- CMakePresets.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/CMakePresets.json b/CMakePresets.json index 189ba7abbeb..675adad2b77 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -174,43 +174,43 @@ { "name": "linux-clang-ninja-debug", "inherits": [ - "linux-clang-debug", - "ninja" + "ninja", + "linux-clang-debug" ] }, { "name": "linux-clang-ninja-release", "inherits": [ - "linux-clang-release", - "ninja" + "ninja", + "linux-clang-release" ] }, { "name": "linux-clang-ninja-relwithdebinfo", "inherits": [ - "linux-clang-relwithdebinfo", - "ninja" + "ninja", + "linux-clang-relwithdebinfo" ] }, { "name": "linux-gcc-ninja-debug", "inherits": [ - "linux-gcc-debug", - "ninja" + "ninja", + "linux-gcc-debug" ] }, { "name": "linux-gcc-ninja-release", "inherits": [ - "linux-gcc-release", - "ninja" + "ninja", + "linux-gcc-release" ] }, { "name": "linux-gcc-ninja-relwithdebinfo", "inherits": [ - "linux-gcc-relwithdebinfo", - "ninja" + "ninja", + "linux-gcc-relwithdebinfo" ] }, { From d8a885ec72e5c690fe86a613d5fd24e608fae6e9 Mon Sep 17 00:00:00 2001 From: Paul Date: Mon, 6 Nov 2023 20:20:50 +0100 Subject: [PATCH 2/2] cleanup presets: make use previous presets for inheritance --- CMakePresets.json | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/CMakePresets.json b/CMakePresets.json index 675adad2b77..632c4ad97b6 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -216,9 +216,7 @@ { "name": "linux-gcc-debug-with-clang-tidy", "inherits": [ - "linux-gcc-base", - "make", - "_debug" + "linux-gcc-debug" ], "cacheVariables": { "QL_CLANG_TIDY_OPTIONS": "-warnings-as-errors=*", @@ -276,9 +274,7 @@ { "name": "linux-ci-build-with-clang-tidy", "inherits": [ - "linux-gcc-base", - "make", - "_debug" + "linux-gcc-debug" ], "cacheVariables": { "BOOST_ROOT": "/usr", @@ -292,9 +288,7 @@ { "name": "linux-ci-build-with-nonstandard-options", "inherits": [ - "linux-gcc-base", - "ninja", - "_release" + "linux-gcc-ninja-release" ], "cacheVariables": { "BOOST_ROOT": "/usr", @@ -319,9 +313,7 @@ { "name": "windows-ci-build-with-nonstandard-options", "inherits": [ - "windows-msvc-base", - "ninja", - "_release" + "windows-msvc-release" ], "cacheVariables": { "CMAKE_CXX_STANDARD": "17",