From c817ff8dee64bb075f87d7399553c19bd4a30f66 Mon Sep 17 00:00:00 2001 From: utzcoz Date: Sat, 11 Mar 2023 15:12:43 +0800 Subject: [PATCH 1/2] build: Move CMakePresets.json to the top directory If developers want to build HelloXR on Windows platform with CMake, they might want to copy `CMakePresets.json` to the top directory for convenience. This copy command might cause dirty git diff. This CL just moves it to the top directory to remove this extra copying command for developers. Signed-off-by: utzcoz --- .github/workflows/msvc-build-preset.yml | 1 - .github/scripts/CMakePresets.json => CMakePresets.json | 0 .../CMakePresets.json.license => CMakePresets.json.license | 0 3 files changed, 1 deletion(-) rename .github/scripts/CMakePresets.json => CMakePresets.json (100%) rename .github/scripts/CMakePresets.json.license => CMakePresets.json.license (100%) diff --git a/.github/workflows/msvc-build-preset.yml b/.github/workflows/msvc-build-preset.yml index bb01ca36b..3c2d94a87 100644 --- a/.github/workflows/msvc-build-preset.yml +++ b/.github/workflows/msvc-build-preset.yml @@ -38,7 +38,6 @@ jobs: - name: Generate build system shell: pwsh run: | - Copy-Item .github/scripts/CMakePresets.json . cmake --fresh --preset ${{ inputs.preset }} -S . -B $env:RUNNER_TEMP - name: Build run: cmake --build $env:RUNNER_TEMP --parallel --clean-first --config ${{ inputs.buildType }} diff --git a/.github/scripts/CMakePresets.json b/CMakePresets.json similarity index 100% rename from .github/scripts/CMakePresets.json rename to CMakePresets.json diff --git a/.github/scripts/CMakePresets.json.license b/CMakePresets.json.license similarity index 100% rename from .github/scripts/CMakePresets.json.license rename to CMakePresets.json.license From bafe287d60f427beef4dd66d11428983312aba89 Mon Sep 17 00:00:00 2001 From: utzcoz Date: Sat, 11 Mar 2023 15:18:31 +0800 Subject: [PATCH 2/2] Add changelog fragment Signed-off-by: utzcoz --- changes/sdk/pr.383.gh.OpenXR-SDK-Source.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 changes/sdk/pr.383.gh.OpenXR-SDK-Source.md diff --git a/changes/sdk/pr.383.gh.OpenXR-SDK-Source.md b/changes/sdk/pr.383.gh.OpenXR-SDK-Source.md new file mode 100644 index 000000000..ba4f66a43 --- /dev/null +++ b/changes/sdk/pr.383.gh.OpenXR-SDK-Source.md @@ -0,0 +1 @@ +build: Move CMakePresets.json to the top directory