From 8801e842dda872e40d2b3fc81644bf235df98f89 Mon Sep 17 00:00:00 2001 From: mason <35282038+emesare@users.noreply.github.com> Date: Tue, 9 Apr 2024 18:47:56 +0000 Subject: [PATCH] Use a seperate CI cmake preset to force build directory This fixes the non-uniform build output directory issue. --- .github/workflows/build.yaml | 2 +- CMakePresets.json | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 8d765cf..b77fb4d 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -8,7 +8,7 @@ on: - master env: - CONFIGURE_PRESET: default-release + CONFIGURE_PRESET: ci-release jobs: build: diff --git a/CMakePresets.json b/CMakePresets.json index cf89c1e..7216ca9 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -30,6 +30,21 @@ "CMAKE_BUILD_TYPE": "Release", "CMAKE_INSTALL_PREFIX": "${sourceDir}/build/${presetName}/install/" } + }, + { + "name": "ci-release", + "displayName": "CI x64 Release", + "description": "Release x64 build using the Ninja generator in CI", + "binaryDir": "${sourceDir}/build/", + "generator": "Ninja", + "architecture": { + "value": "x64", + "strategy": "external" + }, + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Release", + "CMAKE_INSTALL_PREFIX": "${sourceDir}/build/install/" + } } ] } \ No newline at end of file