From 3cbeddab115c9a41751a92887272e2ecf4526413 Mon Sep 17 00:00:00 2001 From: Jean-Louis Leroy Date: Tue, 17 Sep 2024 20:23:18 -0400 Subject: [PATCH] CI: remove shared --- .github/workflows/main.yml | 13 +- CMakePresets.json | 646 +++++++------------------------------ dev/presetgen | 14 +- 3 files changed, 127 insertions(+), 546 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index abc382d3..28eced2b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,14 +10,13 @@ on: [push, pull_request, workflow_dispatch] jobs: job: - name: ${{ matrix.os }}-${{ matrix.compiler }}-${{ matrix.linkage }}-${{ matrix.config }} + name: ${{ matrix.os }}-${{ matrix.compiler }}-${{ matrix.config }} runs-on: ${{ matrix.os }} strategy: fail-fast: false matrix: os: [ubuntu-latest, macos-latest, windows-latest] config: [dbg, rel] - linkage: [static, shared] include: # - os: windows-latest # triplet: x64-windows @@ -29,8 +28,6 @@ jobs: # triplet: x64-osx - os: windows-latest config: dbg - linkage: shared - add_shared_path: $env:PATH += ";" + (Get-Item .).FullName + "\builds\ninja-cl-shared\src\Debug" - os: windows-latest config: rel add_shared_path: $env:PATH += ";" + (Get-Item .).FullName + "\builds\ninja-cl-shared\src\Release" @@ -122,14 +119,12 @@ jobs: - name: Restore from cache the dependencies and generate project files run: | ${{ matrix.pre_configure }} - cmake --preset ninja-${{ matrix.compiler }}-${{ matrix.linkage }} -DCMAKE_CXX_COMPILER=${{ matrix.compiler }} + cmake --preset ninja-${{ matrix.compiler }} -DCMAKE_CXX_COMPILER=${{ matrix.compiler }} - name: Build run: | - ${{ matrix.add_shared_path }} - cmake --build --preset build-ninja-${{ matrix.compiler }}-${{ matrix.linkage}}-${{ matrix.config }} + cmake --build --preset build-ninja-${{ matrix.compiler }}-${{ matrix.config }} - name: Test run: | - ${{ matrix.add_shared_path }} - ctest --preset test-ninja-${{ matrix.compiler }}-${{ matrix.linkage}}-${{ matrix.config }} --output-on-failure + ctest --preset test-ninja-${{ matrix.compiler }}-${{ matrix.config }} --output-on-failure diff --git a/CMakePresets.json b/CMakePresets.json index b4d643c3..53caa2a1 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -7,7 +7,7 @@ }, "configurePresets": [ { - "name": "ninja-clang++-18-static", + "name": "ninja-clang++-18", "generator": "Ninja Multi-Config", "toolchainFile": "${sourceDir}/vcpkg/scripts/buildsystems/vcpkg.cmake", "binaryDir": "${sourceDir}/builds/${presetName}", @@ -22,22 +22,7 @@ } }, { - "name": "ninja-clang++-18-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": "clang++-18", - "CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}", - "CMAKE_EXPORT_COMPILE_COMMANDS": "ON", - "YOMM2_ENABLE_EXAMPLES": "ON", - "YOMM2_ENABLE_TESTS": "ON", - "YOMM2_ENABLE_BENCHMARKS": "ON" - } - }, - { - "name": "ninja-clang++-19-static", + "name": "ninja-clang++-19", "generator": "Ninja Multi-Config", "toolchainFile": "${sourceDir}/vcpkg/scripts/buildsystems/vcpkg.cmake", "binaryDir": "${sourceDir}/builds/${presetName}", @@ -52,37 +37,7 @@ } }, { - "name": "ninja-clang++-19-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": "clang++-19", - "CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}", - "CMAKE_EXPORT_COMPILE_COMMANDS": "ON", - "YOMM2_ENABLE_EXAMPLES": "ON", - "YOMM2_ENABLE_TESTS": "ON", - "YOMM2_ENABLE_BENCHMARKS": "ON" - } - }, - { - "name": "ninja-clang++-20-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": "clang++-20", - "CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}", - "CMAKE_EXPORT_COMPILE_COMMANDS": "ON", - "YOMM2_ENABLE_EXAMPLES": "ON", - "YOMM2_ENABLE_TESTS": "ON", - "YOMM2_ENABLE_BENCHMARKS": "ON" - } - }, - { - "name": "ninja-clang++-20-shared", + "name": "ninja-clang++-20", "generator": "Ninja Multi-Config", "toolchainFile": "${sourceDir}/vcpkg/scripts/buildsystems/vcpkg.cmake", "binaryDir": "${sourceDir}/builds/${presetName}", @@ -97,22 +52,7 @@ } }, { - "name": "ninja-g++-11-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": "g++-11", - "CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}", - "CMAKE_EXPORT_COMPILE_COMMANDS": "ON", - "YOMM2_ENABLE_EXAMPLES": "ON", - "YOMM2_ENABLE_TESTS": "ON", - "YOMM2_ENABLE_BENCHMARKS": "ON" - } - }, - { - "name": "ninja-g++-11-shared", + "name": "ninja-g++-11", "generator": "Ninja Multi-Config", "toolchainFile": "${sourceDir}/vcpkg/scripts/buildsystems/vcpkg.cmake", "binaryDir": "${sourceDir}/builds/${presetName}", @@ -127,7 +67,7 @@ } }, { - "name": "ninja-g++-12-static", + "name": "ninja-g++-12", "generator": "Ninja Multi-Config", "toolchainFile": "${sourceDir}/vcpkg/scripts/buildsystems/vcpkg.cmake", "binaryDir": "${sourceDir}/builds/${presetName}", @@ -142,22 +82,7 @@ } }, { - "name": "ninja-g++-12-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": "g++-12", - "CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}", - "CMAKE_EXPORT_COMPILE_COMMANDS": "ON", - "YOMM2_ENABLE_EXAMPLES": "ON", - "YOMM2_ENABLE_TESTS": "ON", - "YOMM2_ENABLE_BENCHMARKS": "ON" - } - }, - { - "name": "ninja-g++-13-static", + "name": "ninja-g++-13", "generator": "Ninja Multi-Config", "toolchainFile": "${sourceDir}/vcpkg/scripts/buildsystems/vcpkg.cmake", "binaryDir": "${sourceDir}/builds/${presetName}", @@ -172,22 +97,7 @@ } }, { - "name": "ninja-g++-13-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": "g++-13", - "CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}", - "CMAKE_EXPORT_COMPILE_COMMANDS": "ON", - "YOMM2_ENABLE_EXAMPLES": "ON", - "YOMM2_ENABLE_TESTS": "ON", - "YOMM2_ENABLE_BENCHMARKS": "ON" - } - }, - { - "name": "ninja-c++-static", + "name": "ninja-c++", "generator": "Ninja Multi-Config", "toolchainFile": "${sourceDir}/vcpkg/scripts/buildsystems/vcpkg.cmake", "binaryDir": "${sourceDir}/builds/${presetName}", @@ -202,22 +112,7 @@ } }, { - "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": "c++", - "CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}", - "CMAKE_EXPORT_COMPILE_COMMANDS": "ON", - "YOMM2_ENABLE_EXAMPLES": "ON", - "YOMM2_ENABLE_TESTS": "ON", - "YOMM2_ENABLE_BENCHMARKS": "ON" - } - }, - { - "name": "ninja-cl-static", + "name": "ninja-cl", "generator": "Ninja Multi-Config", "toolchainFile": "${sourceDir}/vcpkg/scripts/buildsystems/vcpkg.cmake", "binaryDir": "${sourceDir}/builds/${presetName}", @@ -232,42 +127,7 @@ } }, { - "name": "ninja-cl-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_INSTALL_PREFIX": "${sourceDir}/install/${presetName}", - "CMAKE_EXPORT_COMPILE_COMMANDS": "ON", - "YOMM2_ENABLE_EXAMPLES": "ON", - "YOMM2_ENABLE_TESTS": "ON", - "YOMM2_ENABLE_BENCHMARKS": "ON" - } - }, - { - "name": "msbuild-cl-static", - "generator": "Visual Studio 17 2022", - "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_INSTALL_PREFIX": "${sourceDir}/install/${presetName}", - "CMAKE_EXPORT_COMPILE_COMMANDS": "ON", - "YOMM2_ENABLE_EXAMPLES": "ON", - "YOMM2_ENABLE_TESTS": "ON", - "YOMM2_ENABLE_BENCHMARKS": "ON" - }, - "condition": { - "type": "equals", - "lhs": "${hostSystemName}", - "rhs": "Windows" - } - }, - { - "name": "msbuild-cl-shared", + "name": "msbuild-cl", "generator": "Visual Studio 17 2022", "toolchainFile": "${sourceDir}/vcpkg/scripts/buildsystems/vcpkg.cmake", "binaryDir": "${sourceDir}/builds/${presetName}", @@ -289,546 +149,276 @@ ], "buildPresets": [ { - "name": "build-ninja-clang++-18-static-dbg", - "configurePreset": "ninja-clang++-18-static", - "configuration": "Debug" - }, - { - "name": "build-ninja-clang++-18-static-rel", - "configurePreset": "ninja-clang++-18-static", - "configuration": "Release" - }, - { - "name": "build-ninja-clang++-18-static-reldbg", - "configurePreset": "ninja-clang++-18-static", - "configuration": "RelWithDebInfo" - }, - { - "name": "build-ninja-clang++-18-shared-dbg", - "configurePreset": "ninja-clang++-18-shared", + "name": "build-ninja-clang++-18-dbg", + "configurePreset": "ninja-clang++-18", "configuration": "Debug" }, { - "name": "build-ninja-clang++-18-shared-rel", - "configurePreset": "ninja-clang++-18-shared", + "name": "build-ninja-clang++-18-rel", + "configurePreset": "ninja-clang++-18", "configuration": "Release" }, { - "name": "build-ninja-clang++-18-shared-reldbg", - "configurePreset": "ninja-clang++-18-shared", + "name": "build-ninja-clang++-18-reldbg", + "configurePreset": "ninja-clang++-18", "configuration": "RelWithDebInfo" }, { - "name": "build-ninja-clang++-19-static-dbg", - "configurePreset": "ninja-clang++-19-static", + "name": "build-ninja-clang++-19-dbg", + "configurePreset": "ninja-clang++-19", "configuration": "Debug" }, { - "name": "build-ninja-clang++-19-static-rel", - "configurePreset": "ninja-clang++-19-static", + "name": "build-ninja-clang++-19-rel", + "configurePreset": "ninja-clang++-19", "configuration": "Release" }, { - "name": "build-ninja-clang++-19-static-reldbg", - "configurePreset": "ninja-clang++-19-static", + "name": "build-ninja-clang++-19-reldbg", + "configurePreset": "ninja-clang++-19", "configuration": "RelWithDebInfo" }, { - "name": "build-ninja-clang++-19-shared-dbg", - "configurePreset": "ninja-clang++-19-shared", + "name": "build-ninja-clang++-20-dbg", + "configurePreset": "ninja-clang++-20", "configuration": "Debug" }, { - "name": "build-ninja-clang++-19-shared-rel", - "configurePreset": "ninja-clang++-19-shared", + "name": "build-ninja-clang++-20-rel", + "configurePreset": "ninja-clang++-20", "configuration": "Release" }, { - "name": "build-ninja-clang++-19-shared-reldbg", - "configurePreset": "ninja-clang++-19-shared", + "name": "build-ninja-clang++-20-reldbg", + "configurePreset": "ninja-clang++-20", "configuration": "RelWithDebInfo" }, { - "name": "build-ninja-clang++-20-static-dbg", - "configurePreset": "ninja-clang++-20-static", + "name": "build-ninja-g++-11-dbg", + "configurePreset": "ninja-g++-11", "configuration": "Debug" }, { - "name": "build-ninja-clang++-20-static-rel", - "configurePreset": "ninja-clang++-20-static", + "name": "build-ninja-g++-11-rel", + "configurePreset": "ninja-g++-11", "configuration": "Release" }, { - "name": "build-ninja-clang++-20-static-reldbg", - "configurePreset": "ninja-clang++-20-static", + "name": "build-ninja-g++-11-reldbg", + "configurePreset": "ninja-g++-11", "configuration": "RelWithDebInfo" }, { - "name": "build-ninja-clang++-20-shared-dbg", - "configurePreset": "ninja-clang++-20-shared", + "name": "build-ninja-g++-12-dbg", + "configurePreset": "ninja-g++-12", "configuration": "Debug" }, { - "name": "build-ninja-clang++-20-shared-rel", - "configurePreset": "ninja-clang++-20-shared", + "name": "build-ninja-g++-12-rel", + "configurePreset": "ninja-g++-12", "configuration": "Release" }, { - "name": "build-ninja-clang++-20-shared-reldbg", - "configurePreset": "ninja-clang++-20-shared", + "name": "build-ninja-g++-12-reldbg", + "configurePreset": "ninja-g++-12", "configuration": "RelWithDebInfo" }, { - "name": "build-ninja-g++-11-static-dbg", - "configurePreset": "ninja-g++-11-static", + "name": "build-ninja-g++-13-dbg", + "configurePreset": "ninja-g++-13", "configuration": "Debug" }, { - "name": "build-ninja-g++-11-static-rel", - "configurePreset": "ninja-g++-11-static", + "name": "build-ninja-g++-13-rel", + "configurePreset": "ninja-g++-13", "configuration": "Release" }, { - "name": "build-ninja-g++-11-static-reldbg", - "configurePreset": "ninja-g++-11-static", + "name": "build-ninja-g++-13-reldbg", + "configurePreset": "ninja-g++-13", "configuration": "RelWithDebInfo" }, { - "name": "build-ninja-g++-11-shared-dbg", - "configurePreset": "ninja-g++-11-shared", + "name": "build-ninja-c++-dbg", + "configurePreset": "ninja-c++", "configuration": "Debug" }, { - "name": "build-ninja-g++-11-shared-rel", - "configurePreset": "ninja-g++-11-shared", + "name": "build-ninja-c++-rel", + "configurePreset": "ninja-c++", "configuration": "Release" }, { - "name": "build-ninja-g++-11-shared-reldbg", - "configurePreset": "ninja-g++-11-shared", + "name": "build-ninja-c++-reldbg", + "configurePreset": "ninja-c++", "configuration": "RelWithDebInfo" }, { - "name": "build-ninja-g++-12-static-dbg", - "configurePreset": "ninja-g++-12-static", + "name": "build-ninja-cl-dbg", + "configurePreset": "ninja-cl", "configuration": "Debug" }, { - "name": "build-ninja-g++-12-static-rel", - "configurePreset": "ninja-g++-12-static", + "name": "build-ninja-cl-rel", + "configurePreset": "ninja-cl", "configuration": "Release" }, { - "name": "build-ninja-g++-12-static-reldbg", - "configurePreset": "ninja-g++-12-static", + "name": "build-ninja-cl-reldbg", + "configurePreset": "ninja-cl", "configuration": "RelWithDebInfo" }, { - "name": "build-ninja-g++-12-shared-dbg", - "configurePreset": "ninja-g++-12-shared", + "name": "build-msbuild-cl-dbg", + "configurePreset": "msbuild-cl", "configuration": "Debug" }, { - "name": "build-ninja-g++-12-shared-rel", - "configurePreset": "ninja-g++-12-shared", + "name": "build-msbuild-cl-rel", + "configurePreset": "msbuild-cl", "configuration": "Release" }, { - "name": "build-ninja-g++-12-shared-reldbg", - "configurePreset": "ninja-g++-12-shared", - "configuration": "RelWithDebInfo" - }, - { - "name": "build-ninja-g++-13-static-dbg", - "configurePreset": "ninja-g++-13-static", - "configuration": "Debug" - }, - { - "name": "build-ninja-g++-13-static-rel", - "configurePreset": "ninja-g++-13-static", - "configuration": "Release" - }, - { - "name": "build-ninja-g++-13-static-reldbg", - "configurePreset": "ninja-g++-13-static", - "configuration": "RelWithDebInfo" - }, - { - "name": "build-ninja-g++-13-shared-dbg", - "configurePreset": "ninja-g++-13-shared", - "configuration": "Debug" - }, - { - "name": "build-ninja-g++-13-shared-rel", - "configurePreset": "ninja-g++-13-shared", - "configuration": "Release" - }, - { - "name": "build-ninja-g++-13-shared-reldbg", - "configurePreset": "ninja-g++-13-shared", - "configuration": "RelWithDebInfo" - }, - { - "name": "build-ninja-c++-static-dbg", - "configurePreset": "ninja-c++-static", - "configuration": "Debug" - }, - { - "name": "build-ninja-c++-static-rel", - "configurePreset": "ninja-c++-static", - "configuration": "Release" - }, - { - "name": "build-ninja-c++-static-reldbg", - "configurePreset": "ninja-c++-static", - "configuration": "RelWithDebInfo" - }, - { - "name": "build-ninja-c++-shared-dbg", - "configurePreset": "ninja-c++-shared", - "configuration": "Debug" - }, - { - "name": "build-ninja-c++-shared-rel", - "configurePreset": "ninja-c++-shared", - "configuration": "Release" - }, - { - "name": "build-ninja-c++-shared-reldbg", - "configurePreset": "ninja-c++-shared", - "configuration": "RelWithDebInfo" - }, - { - "name": "build-ninja-cl-static-dbg", - "configurePreset": "ninja-cl-static", - "configuration": "Debug" - }, - { - "name": "build-ninja-cl-static-rel", - "configurePreset": "ninja-cl-static", - "configuration": "Release" - }, - { - "name": "build-ninja-cl-static-reldbg", - "configurePreset": "ninja-cl-static", - "configuration": "RelWithDebInfo" - }, - { - "name": "build-ninja-cl-shared-dbg", - "configurePreset": "ninja-cl-shared", - "configuration": "Debug" - }, - { - "name": "build-ninja-cl-shared-rel", - "configurePreset": "ninja-cl-shared", - "configuration": "Release" - }, - { - "name": "build-ninja-cl-shared-reldbg", - "configurePreset": "ninja-cl-shared", - "configuration": "RelWithDebInfo" - }, - { - "name": "build-msbuild-cl-static-dbg", - "configurePreset": "msbuild-cl-static", - "configuration": "Debug" - }, - { - "name": "build-msbuild-cl-static-rel", - "configurePreset": "msbuild-cl-static", - "configuration": "Release" - }, - { - "name": "build-msbuild-cl-static-reldbg", - "configurePreset": "msbuild-cl-static", - "configuration": "RelWithDebInfo" - }, - { - "name": "build-msbuild-cl-shared-dbg", - "configurePreset": "msbuild-cl-shared", - "configuration": "Debug" - }, - { - "name": "build-msbuild-cl-shared-rel", - "configurePreset": "msbuild-cl-shared", - "configuration": "Release" - }, - { - "name": "build-msbuild-cl-shared-reldbg", - "configurePreset": "msbuild-cl-shared", + "name": "build-msbuild-cl-reldbg", + "configurePreset": "msbuild-cl", "configuration": "RelWithDebInfo" } ], "testPresets": [ { - "name": "test-ninja-clang++-18-static-dbg", - "configurePreset": "ninja-clang++-18-static", - "configuration": "Debug" - }, - { - "name": "test-ninja-clang++-18-static-rel", - "configurePreset": "ninja-clang++-18-static", - "configuration": "Release" - }, - { - "name": "test-ninja-clang++-18-static-reldbg", - "configurePreset": "ninja-clang++-18-static", - "configuration": "RelWithDebInfo" - }, - { - "name": "test-ninja-clang++-18-shared-dbg", - "configurePreset": "ninja-clang++-18-shared", - "configuration": "Debug" - }, - { - "name": "test-ninja-clang++-18-shared-rel", - "configurePreset": "ninja-clang++-18-shared", - "configuration": "Release" - }, - { - "name": "test-ninja-clang++-18-shared-reldbg", - "configurePreset": "ninja-clang++-18-shared", - "configuration": "RelWithDebInfo" - }, - { - "name": "test-ninja-clang++-19-static-dbg", - "configurePreset": "ninja-clang++-19-static", - "configuration": "Debug" - }, - { - "name": "test-ninja-clang++-19-static-rel", - "configurePreset": "ninja-clang++-19-static", - "configuration": "Release" - }, - { - "name": "test-ninja-clang++-19-static-reldbg", - "configurePreset": "ninja-clang++-19-static", - "configuration": "RelWithDebInfo" - }, - { - "name": "test-ninja-clang++-19-shared-dbg", - "configurePreset": "ninja-clang++-19-shared", - "configuration": "Debug" - }, - { - "name": "test-ninja-clang++-19-shared-rel", - "configurePreset": "ninja-clang++-19-shared", - "configuration": "Release" - }, - { - "name": "test-ninja-clang++-19-shared-reldbg", - "configurePreset": "ninja-clang++-19-shared", - "configuration": "RelWithDebInfo" - }, - { - "name": "test-ninja-clang++-20-static-dbg", - "configurePreset": "ninja-clang++-20-static", - "configuration": "Debug" - }, - { - "name": "test-ninja-clang++-20-static-rel", - "configurePreset": "ninja-clang++-20-static", - "configuration": "Release" - }, - { - "name": "test-ninja-clang++-20-static-reldbg", - "configurePreset": "ninja-clang++-20-static", - "configuration": "RelWithDebInfo" - }, - { - "name": "test-ninja-clang++-20-shared-dbg", - "configurePreset": "ninja-clang++-20-shared", - "configuration": "Debug" - }, - { - "name": "test-ninja-clang++-20-shared-rel", - "configurePreset": "ninja-clang++-20-shared", - "configuration": "Release" - }, - { - "name": "test-ninja-clang++-20-shared-reldbg", - "configurePreset": "ninja-clang++-20-shared", - "configuration": "RelWithDebInfo" - }, - { - "name": "test-ninja-g++-11-static-dbg", - "configurePreset": "ninja-g++-11-static", - "configuration": "Debug" - }, - { - "name": "test-ninja-g++-11-static-rel", - "configurePreset": "ninja-g++-11-static", - "configuration": "Release" - }, - { - "name": "test-ninja-g++-11-static-reldbg", - "configurePreset": "ninja-g++-11-static", - "configuration": "RelWithDebInfo" - }, - { - "name": "test-ninja-g++-11-shared-dbg", - "configurePreset": "ninja-g++-11-shared", - "configuration": "Debug" - }, - { - "name": "test-ninja-g++-11-shared-rel", - "configurePreset": "ninja-g++-11-shared", - "configuration": "Release" - }, - { - "name": "test-ninja-g++-11-shared-reldbg", - "configurePreset": "ninja-g++-11-shared", - "configuration": "RelWithDebInfo" - }, - { - "name": "test-ninja-g++-12-static-dbg", - "configurePreset": "ninja-g++-12-static", - "configuration": "Debug" - }, - { - "name": "test-ninja-g++-12-static-rel", - "configurePreset": "ninja-g++-12-static", - "configuration": "Release" - }, - { - "name": "test-ninja-g++-12-static-reldbg", - "configurePreset": "ninja-g++-12-static", - "configuration": "RelWithDebInfo" - }, - { - "name": "test-ninja-g++-12-shared-dbg", - "configurePreset": "ninja-g++-12-shared", + "name": "test-ninja-clang++-18-dbg", + "configurePreset": "ninja-clang++-18", "configuration": "Debug" }, { - "name": "test-ninja-g++-12-shared-rel", - "configurePreset": "ninja-g++-12-shared", + "name": "test-ninja-clang++-18-rel", + "configurePreset": "ninja-clang++-18", "configuration": "Release" }, { - "name": "test-ninja-g++-12-shared-reldbg", - "configurePreset": "ninja-g++-12-shared", + "name": "test-ninja-clang++-18-reldbg", + "configurePreset": "ninja-clang++-18", "configuration": "RelWithDebInfo" }, { - "name": "test-ninja-g++-13-static-dbg", - "configurePreset": "ninja-g++-13-static", + "name": "test-ninja-clang++-19-dbg", + "configurePreset": "ninja-clang++-19", "configuration": "Debug" }, { - "name": "test-ninja-g++-13-static-rel", - "configurePreset": "ninja-g++-13-static", + "name": "test-ninja-clang++-19-rel", + "configurePreset": "ninja-clang++-19", "configuration": "Release" }, { - "name": "test-ninja-g++-13-static-reldbg", - "configurePreset": "ninja-g++-13-static", + "name": "test-ninja-clang++-19-reldbg", + "configurePreset": "ninja-clang++-19", "configuration": "RelWithDebInfo" }, { - "name": "test-ninja-g++-13-shared-dbg", - "configurePreset": "ninja-g++-13-shared", + "name": "test-ninja-clang++-20-dbg", + "configurePreset": "ninja-clang++-20", "configuration": "Debug" }, { - "name": "test-ninja-g++-13-shared-rel", - "configurePreset": "ninja-g++-13-shared", + "name": "test-ninja-clang++-20-rel", + "configurePreset": "ninja-clang++-20", "configuration": "Release" }, { - "name": "test-ninja-g++-13-shared-reldbg", - "configurePreset": "ninja-g++-13-shared", + "name": "test-ninja-clang++-20-reldbg", + "configurePreset": "ninja-clang++-20", "configuration": "RelWithDebInfo" }, { - "name": "test-ninja-c++-static-dbg", - "configurePreset": "ninja-c++-static", + "name": "test-ninja-g++-11-dbg", + "configurePreset": "ninja-g++-11", "configuration": "Debug" }, { - "name": "test-ninja-c++-static-rel", - "configurePreset": "ninja-c++-static", + "name": "test-ninja-g++-11-rel", + "configurePreset": "ninja-g++-11", "configuration": "Release" }, { - "name": "test-ninja-c++-static-reldbg", - "configurePreset": "ninja-c++-static", + "name": "test-ninja-g++-11-reldbg", + "configurePreset": "ninja-g++-11", "configuration": "RelWithDebInfo" }, { - "name": "test-ninja-c++-shared-dbg", - "configurePreset": "ninja-c++-shared", + "name": "test-ninja-g++-12-dbg", + "configurePreset": "ninja-g++-12", "configuration": "Debug" }, { - "name": "test-ninja-c++-shared-rel", - "configurePreset": "ninja-c++-shared", + "name": "test-ninja-g++-12-rel", + "configurePreset": "ninja-g++-12", "configuration": "Release" }, { - "name": "test-ninja-c++-shared-reldbg", - "configurePreset": "ninja-c++-shared", + "name": "test-ninja-g++-12-reldbg", + "configurePreset": "ninja-g++-12", "configuration": "RelWithDebInfo" }, { - "name": "test-ninja-cl-static-dbg", - "configurePreset": "ninja-cl-static", + "name": "test-ninja-g++-13-dbg", + "configurePreset": "ninja-g++-13", "configuration": "Debug" }, { - "name": "test-ninja-cl-static-rel", - "configurePreset": "ninja-cl-static", + "name": "test-ninja-g++-13-rel", + "configurePreset": "ninja-g++-13", "configuration": "Release" }, { - "name": "test-ninja-cl-static-reldbg", - "configurePreset": "ninja-cl-static", + "name": "test-ninja-g++-13-reldbg", + "configurePreset": "ninja-g++-13", "configuration": "RelWithDebInfo" }, { - "name": "test-ninja-cl-shared-dbg", - "configurePreset": "ninja-cl-shared", + "name": "test-ninja-c++-dbg", + "configurePreset": "ninja-c++", "configuration": "Debug" }, { - "name": "test-ninja-cl-shared-rel", - "configurePreset": "ninja-cl-shared", + "name": "test-ninja-c++-rel", + "configurePreset": "ninja-c++", "configuration": "Release" }, { - "name": "test-ninja-cl-shared-reldbg", - "configurePreset": "ninja-cl-shared", + "name": "test-ninja-c++-reldbg", + "configurePreset": "ninja-c++", "configuration": "RelWithDebInfo" }, { - "name": "test-msbuild-cl-static-dbg", - "configurePreset": "msbuild-cl-static", + "name": "test-ninja-cl-dbg", + "configurePreset": "ninja-cl", "configuration": "Debug" }, { - "name": "test-msbuild-cl-static-rel", - "configurePreset": "msbuild-cl-static", + "name": "test-ninja-cl-rel", + "configurePreset": "ninja-cl", "configuration": "Release" }, { - "name": "test-msbuild-cl-static-reldbg", - "configurePreset": "msbuild-cl-static", + "name": "test-ninja-cl-reldbg", + "configurePreset": "ninja-cl", "configuration": "RelWithDebInfo" }, { - "name": "test-msbuild-cl-shared-dbg", - "configurePreset": "msbuild-cl-shared", + "name": "test-msbuild-cl-dbg", + "configurePreset": "msbuild-cl", "configuration": "Debug" }, { - "name": "test-msbuild-cl-shared-rel", - "configurePreset": "msbuild-cl-shared", + "name": "test-msbuild-cl-rel", + "configurePreset": "msbuild-cl", "configuration": "Release" }, { - "name": "test-msbuild-cl-shared-reldbg", - "configurePreset": "msbuild-cl-shared", + "name": "test-msbuild-cl-reldbg", + "configurePreset": "msbuild-cl", "configuration": "RelWithDebInfo" } ] -} +} \ No newline at end of file diff --git a/dev/presetgen b/dev/presetgen index 6fac0c3c..922b45b2 100755 --- a/dev/presetgen +++ b/dev/presetgen @@ -28,7 +28,6 @@ COMPILER_VERSIONS = { "c++": [""], "cl": [""], } -LINKAGE = ["static", "shared"] CONFIGURATIONS = {"dbg": "Debug", "rel": "Release", "reldbg": "RelWithDebInfo"} @@ -41,7 +40,7 @@ presets = { "cmakeMinimumRequired": {"major": 3, "minor": 21, "patch": 0}, "configurePresets": [ { - "name": join(build_system, compiler, version, linkage), + "name": join(build_system, compiler, version), "generator": tool_chain.generator, "toolchainFile": "${sourceDir}/vcpkg/scripts/buildsystems/vcpkg.cmake", "binaryDir": "${sourceDir}/builds/${presetName}", @@ -59,30 +58,27 @@ presets = { for build_system, tool_chain in TOOLCHAINS.items() for compiler in tool_chain.compilers for version in COMPILER_VERSIONS[compiler] - for linkage in LINKAGE ], "buildPresets": [ { - "name": "build-" + join(build_system, compiler, version, linkage, config), - "configurePreset": join(build_system, compiler, version, linkage), + "name": "build-" + join(build_system, compiler, version, config), + "configurePreset": join(build_system, compiler, version), "configuration": CONFIGURATIONS[config], } for build_system, tool_chain in TOOLCHAINS.items() for compiler in tool_chain.compilers for version in COMPILER_VERSIONS[compiler] - for linkage in LINKAGE for config in CONFIGURATIONS ], "testPresets": [ { - "name": "test-" + join(build_system, compiler, version, linkage, config), - "configurePreset": join(build_system, compiler, version, linkage), + "name": "test-" + join(build_system, compiler, version, config), + "configurePreset": join(build_system, compiler, version), "configuration": CONFIGURATIONS[config], } for build_system, tool_chain in TOOLCHAINS.items() for compiler in tool_chain.compilers for version in COMPILER_VERSIONS[compiler] - for linkage in LINKAGE for config in CONFIGURATIONS ], }