CI

jll63 · Aug 15, 2024 · 157b31f · 157b31f
1 parent 53eccfa
commit 157b31f
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 29 deletions.
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -187,13 +187,13 @@
             }
         },
         {
-            "name": "ninja-cl-static",
+            "name": "ninja-c++-static",
             "generator": "Ninja Multi-Config",
             "toolchainFile": "${sourceDir}/vcpkg/scripts/buildsystems/vcpkg.cmake",
             "binaryDir": "${sourceDir}/builds/${presetName}",
             "cacheVariables": {
                 "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
-                "CMAKE_CXX_COMPILER": "cl",
+                "CMAKE_CXX_COMPILER": "c++",
                 "CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}",
                 "YOMM2_ENABLE_EXAMPLES": "ON",
                 "YOMM2_ENABLE_TESTS": "ON",
@@ -202,13 +202,13 @@
             }
         },
         {
-            "name": "ninja-cl-shared",
+            "name": "ninja-c++-shared",
             "generator": "Ninja Multi-Config",
             "toolchainFile": "${sourceDir}/vcpkg/scripts/buildsystems/vcpkg.cmake",
             "binaryDir": "${sourceDir}/builds/${presetName}",
             "cacheVariables": {
                 "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
-                "CMAKE_CXX_COMPILER": "cl",
+                "CMAKE_CXX_COMPILER": "c++",
                 "CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}",
                 "YOMM2_ENABLE_EXAMPLES": "ON",
                 "YOMM2_ENABLE_TESTS": "ON",
@@ -439,33 +439,33 @@
             "configuration": "RelWithDebInfo"
         },
         {
-            "name": "build-ninja-cl-static-dbg",
-            "configurePreset": "ninja-cl-static",
+            "name": "build-ninja-c++-static-dbg",
+            "configurePreset": "ninja-c++-static",
             "configuration": "Debug"
         },
         {
-            "name": "build-ninja-cl-static-rel",
-            "configurePreset": "ninja-cl-static",
+            "name": "build-ninja-c++-static-rel",
+            "configurePreset": "ninja-c++-static",
             "configuration": "Release"
         },
         {
-            "name": "build-ninja-cl-static-reldbg",
-            "configurePreset": "ninja-cl-static",
+            "name": "build-ninja-c++-static-reldbg",
+            "configurePreset": "ninja-c++-static",
             "configuration": "RelWithDebInfo"
         },
         {
-            "name": "build-ninja-cl-shared-dbg",
-            "configurePreset": "ninja-cl-shared",
+            "name": "build-ninja-c++-shared-dbg",
+            "configurePreset": "ninja-c++-shared",
             "configuration": "Debug"
         },
         {
-            "name": "build-ninja-cl-shared-rel",
-            "configurePreset": "ninja-cl-shared",
+            "name": "build-ninja-c++-shared-rel",
+            "configurePreset": "ninja-c++-shared",
             "configuration": "Release"
         },
         {
-            "name": "build-ninja-cl-shared-reldbg",
-            "configurePreset": "ninja-cl-shared",
+            "name": "build-ninja-c++-shared-reldbg",
+            "configurePreset": "ninja-c++-shared",
             "configuration": "RelWithDebInfo"
         },
         {
@@ -681,33 +681,33 @@
             "configuration": "RelWithDebInfo"
         },
         {
-            "name": "test-ninja-cl-static-dbg",
-            "configurePreset": "ninja-cl-static",
+            "name": "test-ninja-c++-static-dbg",
+            "configurePreset": "ninja-c++-static",
             "configuration": "Debug"
         },
         {
-            "name": "test-ninja-cl-static-rel",
-            "configurePreset": "ninja-cl-static",
+            "name": "test-ninja-c++-static-rel",
+            "configurePreset": "ninja-c++-static",
             "configuration": "Release"
         },
         {
-            "name": "test-ninja-cl-static-reldbg",
-            "configurePreset": "ninja-cl-static",
+            "name": "test-ninja-c++-static-reldbg",
+            "configurePreset": "ninja-c++-static",
             "configuration": "RelWithDebInfo"
         },
         {
-            "name": "test-ninja-cl-shared-dbg",
-            "configurePreset": "ninja-cl-shared",
+            "name": "test-ninja-c++-shared-dbg",
+            "configurePreset": "ninja-c++-shared",
             "configuration": "Debug"
         },
         {
-            "name": "test-ninja-cl-shared-rel",
-            "configurePreset": "ninja-cl-shared",
+            "name": "test-ninja-c++-shared-rel",
+            "configurePreset": "ninja-c++-shared",
             "configuration": "Release"
         },
         {
-            "name": "test-ninja-cl-shared-reldbg",
-            "configurePreset": "ninja-cl-shared",
+            "name": "test-ninja-c++-shared-reldbg",
+            "configurePreset": "ninja-c++-shared",
             "configuration": "RelWithDebInfo"
         },
         {

diff --git a/dev/presetgen b/dev/presetgen
@@ -14,7 +14,7 @@ class ToolChain:
 
 
 TOOLCHAINS = {
-    "ninja": ToolChain("Ninja Multi-Config", "clang++ g++ cl".split()),
+    "ninja": ToolChain("Ninja Multi-Config", "clang++ g++ c++".split()),
     "msbuild": ToolChain(
         "Visual Studio 17 2022",
         ["cl"],
@@ -25,6 +25,7 @@ GENERATORS = {"ninja": "Ninja Multi-Config", "msbuild": "Visual Studio 17 2022"}
 COMPILER_VERSIONS = {
     "clang++": "18 19 20".split(),
     "g++": "11 12 13".split(),
+    "c++": [""],
     "cl": [""],
 }
 LINKAGE = ["static", "shared"]