diff --git a/.github/actions/package/linux/action.yml b/.github/actions/package/linux/action.yml index 4aebcf39d..74e1c2a14 100644 --- a/.github/actions/package/linux/action.yml +++ b/.github/actions/package/linux/action.yml @@ -13,10 +13,6 @@ inputs: description: Name of the uploaded artifact required: true default: Linux - cmake-preset: - description: Base CMake preset previously used for the build - required: true - default: linux qt-version: description: Version of Qt to use required: true @@ -62,7 +58,7 @@ runs: GPG_PRIVATE_KEY: ${{ inputs.gpg-private-key }} run: | - cmake --install ${{ env.BUILD_DIR }} --prefix ${{ env.INSTALL_APPIMAGE_DIR }}/usr + cmake --install ${{ env.BUILD_DIR }} --config ${{ inputs.build-type }} --prefix ${{ env.INSTALL_APPIMAGE_DIR }}/usr mv ${{ env.INSTALL_APPIMAGE_DIR }}/usr/share/metainfo/org.prismlauncher.PrismLauncher.metainfo.xml ${{ env.INSTALL_APPIMAGE_DIR }}/usr/share/metainfo/org.prismlauncher.PrismLauncher.appdata.xml export "NO_APPSTREAM=1" # we have to skip appstream checking because appstream on ubuntu 20.04 is outdated @@ -107,12 +103,10 @@ runs: env: BUILD_DIR: build - CMAKE_PRESET: ${{ inputs.cmake-preset }} - INSTALL_PORTABLE_DIR: install-portable run: | - cmake --install ${{ env.BUILD_DIR }} --prefix ${{ env.INSTALL_PORTABLE_DIR }} - cmake --install ${{ env.BUILD_DIR }} --prefix ${{ env.INSTALL_PORTABLE_DIR }} --component portable + cmake --install ${{ env.BUILD_DIR }} --config ${{ inputs.build-type }} --prefix ${{ env.INSTALL_PORTABLE_DIR }} + cmake --install ${{ env.BUILD_DIR }} --config ${{ inputs.build-type }} --prefix ${{ env.INSTALL_PORTABLE_DIR }} --component portable for l in $(find ${{ env.INSTALL_PORTABLE_DIR }} -type f); do l=${l#$(pwd)/}; l=${l#${{ env.INSTALL_PORTABLE_DIR }}/}; l=${l#./}; echo $l; done > ${{ env.INSTALL_PORTABLE_DIR }}/manifest.txt cd ${{ env.INSTALL_PORTABLE_DIR }} diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d683fb6d1..6d68efac9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -81,7 +81,7 @@ jobs: include: - os: ubuntu-22.04 artifact-name: Linux - base-cmake-preset: linux + cmake-preset: linux # NOTE(@getchoo): Yes, we're intentionally using 24.04 here!!! # @@ -89,34 +89,34 @@ jobs: # *for the same version* are compiled against 24.04 on ARM, and *not* 22.04 like x64 - os: ubuntu-24.04-arm artifact-name: Linux-aarch64 - base-cmake-preset: linux + cmake-preset: linux - os: windows-2022 artifact-name: Windows-MinGW-w64 - base-cmake-preset: windows_mingw + cmake-preset: windows_mingw msystem: CLANG64 vcvars-arch: amd64_x86 - os: windows-11-arm artifact-name: Windows-MinGW-arm64 - base-cmake-preset: windows_mingw + cmake-preset: windows_mingw msystem: CLANGARM64 vcvars-arch: arm64 - os: windows-2022 artifact-name: Windows-MSVC - base-cmake-preset: windows_msvc + cmake-preset: windows_msvc # TODO(@getchoo): This is the default in setup-dependencies/windows. Why isn't it working?!?! vcvars-arch: amd64 - os: windows-11-arm artifact-name: Windows-MSVC-arm64 - base-cmake-preset: windows_msvc + cmake-preset: windows_msvc vcvars-arch: arm64 - os: macos-14 artifact-name: macOS - base-cmake-preset: ${{ (inputs.build-type || 'Debug') == 'Debug' && 'macos_universal' || 'macos' }} + cmake-preset: macos_universal macosx-deployment-target: 12.0 runs-on: ${{ matrix.os }} @@ -126,6 +126,11 @@ jobs: shell: ${{ matrix.msystem != '' && 'msys2 {0}' || 'bash' }} env: + ARTIFACT_NAME: ${{ matrix.artifact-name }}-Qt6 + BUILD_PLATFORM: official + BUILD_TYPE: ${{ inputs.build-type || 'Debug' }} + CMAKE_PRESET: ${{ matrix.cmake-preset }} + MACOSX_DEPLOYMENT_TARGET: ${{ matrix.macosx-deployment-target }} steps: @@ -142,7 +147,7 @@ jobs: id: setup-dependencies uses: ./.github/actions/setup-dependencies with: - build-type: ${{ inputs.build-type || 'Debug' }} + build-type: ${{ env.BUILD_TYPE }} artifact-name: ${{ matrix.artifact-name }} msystem: ${{ matrix.msystem }} vcvars-arch: ${{ matrix.vcvars-arch }} @@ -152,22 +157,17 @@ jobs: # BUILD ## - - name: Get CMake preset - id: cmake-preset - env: - BASE_CMAKE_PRESET: ${{ matrix.base-cmake-preset }} - PRESET_TYPE: ${{ (inputs.build-type || 'Debug') == 'Debug' && 'debug' || 'ci' }} + - name: Configure project run: | - echo preset="$BASE_CMAKE_PRESET"_"$PRESET_TYPE" >> "$GITHUB_OUTPUT" + cmake --preset "$CMAKE_PRESET" - - name: Run CMake workflow - env: - CMAKE_PRESET: ${{ steps.cmake-preset.outputs.preset }} - - ARTIFACT_NAME: ${{ matrix.artifact-name }}-Qt6 - BUILD_PLATFORM: official + - name: Run build run: | - cmake --workflow --preset "$CMAKE_PRESET" + cmake --build --preset "$CMAKE_PRESET" --config "$BUILD_TYPE" + + - name: Run tests + run: | + ctest --preset "$CMAKE_PRESET" --build-config "$BUILD_TYPE" ## # PACKAGE @@ -186,7 +186,6 @@ jobs: version: ${{ steps.short-version.outputs.version }} build-type: ${{ steps.setup-dependencies.outputs.build-type }} artifact-name: ${{ matrix.artifact-name }} - cmake-preset: ${{ steps.cmake-preset.outputs.preset }} qt-version: ${{ steps.setup-dependencies.outputs.qt-version }} gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 47fa17f3d..3fdcc68ba 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -78,8 +78,8 @@ jobs: - name: Configure and Build run: | - cmake --preset linux_debug - cmake --build --preset linux_debug + cmake --preset linux + cmake --build --preset linux --config Debug - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v4 diff --git a/CMakeLists.txt b/CMakeLists.txt index 95e147984..0ea2d4880 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -112,7 +112,7 @@ set(CMAKE_CXX_FLAGS_RELEASE "-O2 -D_FORTIFY_SOURCE=2 ${CMAKE_CXX_FLAGS_RELEASE}" # Export compile commands for debug builds if we can (useful in LSPs like clangd) # https://cmake.org/cmake/help/v3.31/variable/CMAKE_EXPORT_COMPILE_COMMANDS.html -if(CMAKE_GENERATOR STREQUAL "Unix Makefiles" OR CMAKE_GENERATOR STREQUAL "Ninja" AND CMAKE_BUILD_TYPE STREQUAL "Debug") +if(CMAKE_GENERATOR STREQUAL "Unix Makefiles" OR CMAKE_GENERATOR MATCHES "^Ninja") set(CMAKE_EXPORT_COMPILE_COMMANDS ON) endif() diff --git a/CMakePresets.json b/CMakePresets.json index f8e688b89..613fada07 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -5,10 +5,210 @@ "major": 3, "minor": 28 }, - "include": [ - "cmake/linuxPreset.json", - "cmake/macosPreset.json", - "cmake/windowsMinGWPreset.json", - "cmake/windowsMSVCPreset.json" + "configurePresets": [ + { + "name": "base", + "hidden": true, + "binaryDir": "build", + "installDir": "install", + "generator": "Ninja Multi-Config", + "cacheVariables": { + "Launcher_BUILD_ARTIFACT": "$penv{ARTIFACT_NAME}", + "Launcher_BUILD_PLATFORM": "$penv{BUILD_PLATFORM}", + "Launcher_ENABLE_JAVA_DOWNLOADER": "ON", + "ENABLE_LTO": "ON" + } + }, + { + "name": "linux", + "displayName": "Linux", + "inherits": [ + "base" + ], + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Linux" + } + }, + { + "name": "macos", + "displayName": "macOS", + "inherits": [ + "base" + ], + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Darwin" + } + }, + { + "name": "macos_universal", + "displayName": "macOS (Universal Binary)", + "inherits": [ + "macos" + ], + "cacheVariables": { + "CMAKE_OSX_ARCHITECTURES": "x86_64;arm64", + "VCPKG_TARGET_TRIPLET": "universal-osx" + } + }, + { + "name": "windows_mingw", + "displayName": "Windows (MinGW)", + "inherits": [ + "base" + ], + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Windows" + } + }, + { + "name": "windows_msvc", + "displayName": "Windows (MSVC)", + "inherits": [ + "base" + ], + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Windows" + } + } + ], + "buildPresets": [ + { + "name": "linux", + "displayName": "Linux", + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Linux" + }, + "configurePreset": "linux" + }, + { + "name": "macos", + "displayName": "macOS", + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Darwin" + }, + "configurePreset": "macos" + }, + { + "name": "macos_universal", + "displayName": "macOS (Universal Binary)", + "inherits": [ + "macos" + ], + "configurePreset": "macos_universal" + }, + { + "name": "windows_mingw", + "displayName": "Windows (MinGW)", + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Windows" + }, + "configurePreset": "windows_mingw" + }, + { + "name": "windows_msvc", + "displayName": "Windows (MSVC)", + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Windows" + }, + "configurePreset": "windows_msvc" + } + ], + "testPresets": [ + { + "name": "base", + "hidden": true, + "output": { + "outputOnFailure": true + }, + "execution": { + "noTestsAction": "error" + }, + "filter": { + "exclude": { + "name": "^example64|example$" + } + } + }, + { + "name": "linux", + "displayName": "Linux", + "inherits": [ + "base" + ], + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Linux" + }, + "configurePreset": "linux" + }, + { + "name": "macos", + "displayName": "macOS", + "inherits": [ + "base" + ], + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Darwin" + }, + "configurePreset": "macos" + }, + { + "name": "macos_universal", + "displayName": "macOS (Universal Binary)", + "inherits": [ + "base" + ], + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Darwin" + }, + "configurePreset": "macos_universal" + }, + { + "name": "windows_mingw", + "displayName": "Windows (MinGW)", + "inherits": [ + "base" + ], + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Windows" + }, + "configurePreset": "windows_mingw" + }, + { + "name": "windows_msvc", + "displayName": "Windows (MSVC)", + "inherits": [ + "base" + ], + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Windows" + }, + "configurePreset": "windows_msvc" + } ] } diff --git a/cmake/commonPresets.json b/cmake/commonPresets.json deleted file mode 100644 index 9be0fb447..000000000 --- a/cmake/commonPresets.json +++ /dev/null @@ -1,81 +0,0 @@ -{ - "$schema": "https://cmake.org/cmake/help/latest/_downloads/3e2d73bff478d88a7de0de736ba5e361/schema.json", - "version": 8, - "configurePresets": [ - { - "name": "base", - "hidden": true, - "binaryDir": "build", - "installDir": "install", - "cacheVariables": { - "Launcher_BUILD_ARTIFACT": "$penv{ARTIFACT_NAME}", - "Launcher_BUILD_PLATFORM": "$penv{BUILD_PLATFORM}" - } - }, - { - "name": "base_debug", - "hidden": true, - "inherits": [ - "base" - ], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug" - } - }, - { - "name": "base_release", - "hidden": true, - "inherits": [ - "base" - ], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "ENABLE_LTO": "ON" - } - }, - { - "name": "base_ci", - "hidden": true, - "inherits": [ - "base_release" - ], - "cacheVariables": { - "Launcher_FORCE_BUNDLED_LIBS": "ON" - } - } - ], - "testPresets": [ - { - "name": "base", - "hidden": true, - "output": { - "outputOnFailure": true - }, - "execution": { - "noTestsAction": "error" - }, - "filter": { - "exclude": { - "name": "^example64|example$" - } - } - }, - { - "name": "base_debug", - "hidden": true, - "inherits": [ - "base" - ], - "output": { - "debug": true - } - }, - { - "name": "base_release", - "hidden": true, - "inherits": [ - "base" - ] - } - ] -} diff --git a/cmake/linuxPreset.json b/cmake/linuxPreset.json deleted file mode 100644 index 984defa5d..000000000 --- a/cmake/linuxPreset.json +++ /dev/null @@ -1,176 +0,0 @@ -{ - "$schema": "https://cmake.org/cmake/help/latest/_downloads/3e2d73bff478d88a7de0de736ba5e361/schema.json", - "version": 8, - "include": [ - "commonPresets.json" - ], - "configurePresets": [ - { - "name": "linux_base", - "hidden": true, - "condition": { - "type": "equals", - "lhs": "${hostSystemName}", - "rhs": "Linux" - }, - "generator": "Ninja", - "cacheVariables": { - "Launcher_ENABLE_JAVA_DOWNLOADER": "ON" - } - }, - { - "name": "linux_debug", - "inherits": [ - "base_debug", - "linux_base" - ], - "displayName": "Linux (Debug)" - }, - { - "name": "linux_release", - "inherits": [ - "base_release", - "linux_base" - ], - "displayName": "Linux (Release)" - }, - { - "name": "linux_ci", - "inherits": [ - "base_ci", - "linux_base" - ], - "displayName": "Linux (CI)", - "installDir": "/usr" - } - ], - "buildPresets": [ - { - "name": "linux_base", - "hidden": true, - "condition": { - "type": "equals", - "lhs": "${hostSystemName}", - "rhs": "Linux" - } - }, - { - "name": "linux_debug", - "inherits": [ - "linux_base" - ], - "displayName": "Linux (Debug)", - "configurePreset": "linux_debug" - }, - { - "name": "linux_release", - "inherits": [ - "linux_base" - ], - "displayName": "Linux (Release)", - "configurePreset": "linux_release" - }, - { - "name": "linux_ci", - "inherits": [ - "linux_base" - ], - "displayName": "Linux (CI)", - "configurePreset": "linux_ci" - } - ], - "testPresets": [ - { - "name": "linux_base", - "hidden": true, - "condition": { - "type": "equals", - "lhs": "${hostSystemName}", - "rhs": "Linux" - } - }, - { - "name": "linux_debug", - "inherits": [ - "base_debug", - "linux_base" - ], - "displayName": "Linux (Debug)", - "configurePreset": "linux_debug" - }, - { - "name": "linux_release", - "inherits": [ - "base_release", - "linux_base" - ], - "displayName": "Linux (Release)", - "configurePreset": "linux_release" - }, - { - "name": "linux_ci", - "inherits": [ - "base_release", - "linux_base" - ], - "displayName": "Linux (CI)", - "configurePreset": "linux_ci" - } - ], - "workflowPresets": [ - { - "name": "linux_debug", - "displayName": "Linux (Debug)", - "steps": [ - { - "type": "configure", - "name": "linux_debug" - }, - { - "type": "build", - "name": "linux_debug" - }, - { - "type": "test", - "name": "linux_debug" - } - ] - }, - { - "name": "linux", - "displayName": "Linux (Release)", - "steps": [ - { - "type": "configure", - "name": "linux_release" - }, - { - "type": "build", - "name": "linux_release" - }, - { - "type": "test", - "name": "linux_release" - } - ] - }, - { - "name": "linux_ci", - "displayName": "Linux (CI)", - "steps": [ - { - "type": "configure", - "name": "linux_ci" - }, - { - "type": "build", - "name": "linux_ci" - }, - { - "type": "test", - "name": "linux_ci" - } - ] - } - ] -} diff --git a/cmake/macosPreset.json b/cmake/macosPreset.json deleted file mode 100644 index 9098f9a9a..000000000 --- a/cmake/macosPreset.json +++ /dev/null @@ -1,269 +0,0 @@ -{ - "$schema": "https://cmake.org/cmake/help/latest/_downloads/3e2d73bff478d88a7de0de736ba5e361/schema.json", - "version": 8, - "include": [ - "commonPresets.json" - ], - "configurePresets": [ - { - "name": "macos_base", - "hidden": true, - "condition": { - "type": "equals", - "lhs": "${hostSystemName}", - "rhs": "Darwin" - }, - "generator": "Ninja" - }, - { - "name": "macos_universal_base", - "hidden": true, - "inherits": [ - "macos_base" - ], - "cacheVariables": { - "CMAKE_OSX_ARCHITECTURES": "x86_64;arm64", - "VCPKG_TARGET_TRIPLET": "universal-osx" - } - }, - { - "name": "macos_debug", - "inherits": [ - "base_debug", - "macos_base" - ], - "displayName": "macOS (Debug)" - }, - { - "name": "macos_release", - "inherits": [ - "base_release", - "macos_base" - ], - "displayName": "macOS (Release)" - }, - { - "name": "macos_universal_debug", - "inherits": [ - "base_debug", - "macos_universal_base" - ], - "displayName": "macOS (Universal Binary, Debug)" - }, - { - "name": "macos_universal_release", - "inherits": [ - "base_release", - "macos_universal_base" - ], - "displayName": "macOS (Universal Binary, Release)" - }, - { - "name": "macos_ci", - "inherits": [ - "base_ci", - "macos_universal_base" - ], - "displayName": "macOS (CI)" - } - ], - "buildPresets": [ - { - "name": "macos_base", - "hidden": true, - "condition": { - "type": "equals", - "lhs": "${hostSystemName}", - "rhs": "Darwin" - } - }, - { - "name": "macos_debug", - "inherits": [ - "macos_base" - ], - "displayName": "macOS (Debug)", - "configurePreset": "macos_debug" - }, - { - "name": "macos_release", - "inherits": [ - "macos_base" - ], - "displayName": "macOS (Release)", - "configurePreset": "macos_release" - }, - { - "name": "macos_universal_debug", - "inherits": [ - "macos_base" - ], - "displayName": "macOS (Universal Binary, Debug)", - "configurePreset": "macos_universal_debug" - }, - { - "name": "macos_universal_release", - "inherits": [ - "macos_base" - ], - "displayName": "macOS (Universal Binary, Release)", - "configurePreset": "macos_universal_release" - }, - { - "name": "macos_ci", - "inherits": [ - "macos_base" - ], - "displayName": "macOS (CI)", - "configurePreset": "macos_ci" - } - ], - "testPresets": [ - { - "name": "macos_base", - "hidden": true, - "condition": { - "type": "equals", - "lhs": "${hostSystemName}", - "rhs": "Darwin" - } - }, - { - "name": "macos_debug", - "inherits": [ - "base_debug", - "macos_base" - ], - "displayName": "MacOS (Debug)", - "configurePreset": "macos_debug" - }, - { - "name": "macos_release", - "inherits": [ - "base_release", - "macos_base" - ], - "displayName": "macOS (Release)", - "configurePreset": "macos_release" - }, - { - "name": "macos_universal_debug", - "inherits": [ - "base_debug", - "macos_base" - ], - "displayName": "MacOS (Universal Binary, Debug)", - "configurePreset": "macos_universal_debug" - }, - { - "name": "macos_universal_release", - "inherits": [ - "base_release", - "macos_base" - ], - "displayName": "macOS (Universal Binary, Release)", - "configurePreset": "macos_universal_release" - }, - { - "name": "macos_ci", - "inherits": [ - "base_release", - "macos_base" - ], - "displayName": "macOS (CI)", - "configurePreset": "macos_ci" - } - ], - "workflowPresets": [ - { - "name": "macos_debug", - "displayName": "macOS (Debug)", - "steps": [ - { - "type": "configure", - "name": "macos_debug" - }, - { - "type": "build", - "name": "macos_debug" - }, - { - "type": "test", - "name": "macos_debug" - } - ] - }, - { - "name": "macos", - "displayName": "macOS (Release)", - "steps": [ - { - "type": "configure", - "name": "macos_release" - }, - { - "type": "build", - "name": "macos_release" - }, - { - "type": "test", - "name": "macos_release" - } - ] - }, - { - "name": "macos_universal_debug", - "displayName": "macOS (Universal Binary, Debug)", - "steps": [ - { - "type": "configure", - "name": "macos_universal_debug" - }, - { - "type": "build", - "name": "macos_universal_debug" - }, - { - "type": "test", - "name": "macos_universal_debug" - } - ] - }, - { - "name": "macos_universal", - "displayName": "macOS (Universal Binary, Release)", - "steps": [ - { - "type": "configure", - "name": "macos_universal_release" - }, - { - "type": "build", - "name": "macos_universal_release" - }, - { - "type": "test", - "name": "macos_universal_release" - } - ] - }, - { - "name": "macos_ci", - "displayName": "macOS (CI)", - "steps": [ - { - "type": "configure", - "name": "macos_ci" - }, - { - "type": "build", - "name": "macos_ci" - }, - { - "type": "test", - "name": "macos_ci" - } - ] - } - ] -} diff --git a/cmake/windowsMSVCPreset.json b/cmake/windowsMSVCPreset.json deleted file mode 100644 index 2cb996b81..000000000 --- a/cmake/windowsMSVCPreset.json +++ /dev/null @@ -1,281 +0,0 @@ -{ - "$schema": "https://cmake.org/cmake/help/latest/_downloads/3e2d73bff478d88a7de0de736ba5e361/schema.json", - "version": 8, - "include": [ - "commonPresets.json" - ], - "configurePresets": [ - { - "name": "windows_msvc_base", - "hidden": true, - "condition": { - "type": "equals", - "lhs": "${hostSystemName}", - "rhs": "Windows" - }, - "generator": "Ninja" - }, - { - "name": "windows_msvc_arm64_cross_base", - "hidden": true, - "inherits": [ - "windows_msvc_base" - ], - "cacheVariables": { - "CMAKE_SYSTEM_NAME": "${hostSystemName}" - } - }, - { - "name": "windows_msvc_debug", - "inherits": [ - "base_debug", - "windows_msvc_base" - ], - "displayName": "Windows MSVC (Debug)" - }, - { - "name": "windows_msvc_release", - "inherits": [ - "base_release", - "windows_msvc_base" - ], - "displayName": "Windows MSVC (Release)" - }, - { - "name": "windows_msvc_arm64_cross_debug", - "inherits": [ - "base_debug", - "windows_msvc_arm64_cross_base" - ], - "displayName": "Windows MSVC (ARM64 cross, Debug)" - }, - { - "name": "windows_msvc_arm64_cross_release", - "inherits": [ - "base_release", - "windows_msvc_arm64_cross_base" - ], - "displayName": "Windows MSVC (ARM64 cross, Release)" - }, - { - "name": "windows_msvc_ci", - "inherits": [ - "base_ci", - "windows_msvc_base" - ], - "displayName": "Windows MSVC (CI)" - }, - { - "name": "windows_msvc_arm64_cross_ci", - "inherits": [ - "base_ci", - "windows_msvc_arm64_cross_base" - ], - "displayName": "Windows MSVC (ARM64 cross, CI)" - } - ], - "buildPresets": [ - { - "name": "windows_msvc_base", - "hidden": true, - "condition": { - "type": "equals", - "lhs": "${hostSystemName}", - "rhs": "Windows" - } - }, - { - "name": "windows_msvc_debug", - "inherits": [ - "windows_msvc_base" - ], - "displayName": "Windows MSVC (Debug)", - "configurePreset": "windows_msvc_debug", - "configuration": "Debug" - }, - { - "name": "windows_msvc_release", - "inherits": [ - "windows_msvc_base" - ], - "displayName": "Windows MSVC (Release)", - "configurePreset": "windows_msvc_release", - "configuration": "Release" - }, - { - "name": "windows_msvc_arm64_cross_debug", - "inherits": [ - "windows_msvc_base" - ], - "displayName": "Windows MSVC (ARM64 cross, Debug)", - "configurePreset": "windows_msvc_arm64_cross_debug", - "configuration": "Debug" - }, - { - "name": "windows_msvc_arm64_cross_release", - "inherits": [ - "windows_msvc_base" - ], - "displayName": "Windows MSVC (ARM64 cross, Release)", - "configurePreset": "windows_msvc_arm64_cross_release", - "configuration": "Release" - }, - { - "name": "windows_msvc_ci", - "inherits": [ - "windows_msvc_base" - ], - "displayName": "Windows MSVC (CI)", - "configurePreset": "windows_msvc_ci", - "configuration": "Release" - }, - { - "name": "windows_msvc_arm64_cross_ci", - "inherits": [ - "windows_msvc_base" - ], - "displayName": "Windows MSVC (ARM64 cross, CI)", - "configurePreset": "windows_msvc_arm64_cross_ci", - "configuration": "Release" - } - ], - "testPresets": [ - { - "name": "windows_msvc_base", - "hidden": true, - "condition": { - "type": "equals", - "lhs": "${hostSystemName}", - "rhs": "Windows" - } - }, - { - "name": "windows_msvc_debug", - "inherits": [ - "base_debug", - "windows_msvc_base" - ], - "displayName": "Windows MSVC (Debug)", - "configurePreset": "windows_msvc_debug", - "configuration": "Debug" - }, - { - "name": "windows_msvc_release", - "inherits": [ - "base_release", - "windows_msvc_base" - ], - "displayName": "Windows MSVC (Release)", - "configurePreset": "windows_msvc_release", - "configuration": "Release" - }, - { - "name": "windows_msvc_ci", - "inherits": [ - "base_release", - "windows_msvc_base" - ], - "displayName": "Windows MSVC (CI)", - "configurePreset": "windows_msvc_ci", - "configuration": "Release" - } - ], - "workflowPresets": [ - { - "name": "windows_msvc_debug", - "displayName": "Windows MSVC (Debug)", - "steps": [ - { - "type": "configure", - "name": "windows_msvc_debug" - }, - { - "type": "build", - "name": "windows_msvc_debug" - }, - { - "type": "test", - "name": "windows_msvc_debug" - } - ] - }, - { - "name": "windows_msvc", - "displayName": "Windows MSVC (Release)", - "steps": [ - { - "type": "configure", - "name": "windows_msvc_release" - }, - { - "type": "build", - "name": "windows_msvc_release" - }, - { - "type": "test", - "name": "windows_msvc_release" - } - ] - }, - { - "name": "windows_msvc_arm64_cross_debug", - "displayName": "Windows MSVC (ARM64 cross, Debug)", - "steps": [ - { - "type": "configure", - "name": "windows_msvc_arm64_cross_debug" - }, - { - "type": "build", - "name": "windows_msvc_arm64_cross_debug" - } - ] - }, - { - "name": "windows_msvc_arm64_cross", - "displayName": "Windows MSVC (ARM64 cross, Release)", - "steps": [ - { - "type": "configure", - "name": "windows_msvc_arm64_cross_release" - }, - { - "type": "build", - "name": "windows_msvc_arm64_cross_release" - } - ] - }, - { - "name": "windows_msvc_ci", - "displayName": "Windows MSVC (CI)", - "steps": [ - { - "type": "configure", - "name": "windows_msvc_ci" - }, - { - "type": "build", - "name": "windows_msvc_ci" - }, - { - "type": "test", - "name": "windows_msvc_ci" - } - ] - }, - { - "name": "windows_msvc_arm64_cross_ci", - "displayName": "Windows MSVC (ARM64 cross, CI)", - "steps": [ - { - "type": "configure", - "name": "windows_msvc_arm64_cross_ci" - }, - { - "type": "build", - "name": "windows_msvc_arm64_cross_ci" - } - ] - } - ] -} diff --git a/cmake/windowsMinGWPreset.json b/cmake/windowsMinGWPreset.json deleted file mode 100644 index 7c4adbcf2..000000000 --- a/cmake/windowsMinGWPreset.json +++ /dev/null @@ -1,177 +0,0 @@ -{ - "$schema": "https://cmake.org/cmake/help/latest/_downloads/3e2d73bff478d88a7de0de736ba5e361/schema.json", - "version": 8, - "include": [ - "commonPresets.json" - ], - "configurePresets": [ - { - "name": "windows_mingw_base", - "hidden": true, - "condition": { - "type": "equals", - "lhs": "${hostSystemName}", - "rhs": "Windows" - }, - "generator": "Ninja" - }, - { - "name": "windows_mingw_debug", - "inherits": [ - "base_debug", - "windows_mingw_base" - ], - "displayName": "Windows MinGW (Debug)" - }, - { - "name": "windows_mingw_release", - "inherits": [ - "base_release", - "windows_mingw_base" - ], - "displayName": "Windows MinGW (Release)" - }, - { - "name": "windows_mingw_ci", - "inherits": [ - "base_ci", - "windows_mingw_base" - ], - "displayName": "Windows MinGW (CI)" - } - ], - "buildPresets": [ - { - "name": "windows_mingw_base", - "hidden": true, - "condition": { - "type": "equals", - "lhs": "${hostSystemName}", - "rhs": "Windows" - } - }, - { - "name": "windows_mingw_debug", - "inherits": [ - "windows_mingw_base" - ], - "displayName": "Windows MinGW (Debug)", - "configurePreset": "windows_mingw_debug" - }, - { - "name": "windows_mingw_release", - "inherits": [ - "windows_mingw_base" - ], - "displayName": "Windows MinGW (Release)", - "configurePreset": "windows_mingw_release" - }, - { - "name": "windows_mingw_ci", - "inherits": [ - "windows_mingw_base" - ], - "displayName": "Windows MinGW (CI)", - "configurePreset": "windows_mingw_ci" - } - ], - "testPresets": [ - { - "name": "windows_mingw_base", - "hidden": true, - "condition": { - "type": "equals", - "lhs": "${hostSystemName}", - "rhs": "Windows" - }, - "filter": { - "exclude": { - "name": "^example64|example$" - } - } - }, - { - "name": "windows_mingw_debug", - "inherits": [ - "base_debug", - "windows_mingw_base" - ], - "displayName": "Windows MinGW (Debug)", - "configurePreset": "windows_mingw_debug" - }, - { - "name": "windows_mingw_release", - "inherits": [ - "base_release", - "windows_mingw_base" - ], - "displayName": "Windows MinGW (Release)", - "configurePreset": "windows_mingw_release" - }, - { - "name": "windows_mingw_ci", - "inherits": [ - "base_release", - "windows_mingw_base" - ], - "displayName": "Windows MinGW (CI)", - "configurePreset": "windows_mingw_ci" - } - ], - "workflowPresets": [ - { - "name": "windows_mingw_debug", - "displayName": "Windows MinGW (Debug)", - "steps": [ - { - "type": "configure", - "name": "windows_mingw_debug" - }, - { - "type": "build", - "name": "windows_mingw_debug" - }, - { - "type": "test", - "name": "windows_mingw_debug" - } - ] - }, - { - "name": "windows_mingw", - "displayName": "Windows MinGW (Release)", - "steps": [ - { - "type": "configure", - "name": "windows_mingw_release" - }, - { - "type": "build", - "name": "windows_mingw_release" - }, - { - "type": "test", - "name": "windows_mingw_release" - } - ] - }, - { - "name": "windows_mingw_ci", - "displayName": "Windows MinGW (CI)", - "steps": [ - { - "type": "configure", - "name": "windows_mingw_ci" - }, - { - "type": "build", - "name": "windows_mingw_ci" - }, - { - "type": "test", - "name": "windows_mingw_ci" - } - ] - } - ] -}