Imply CMake source dir

Shortening our command lines slightly
This commit is contained in:
ISSOtm
2026-04-16 02:49:15 +02:00
committed by Rangi
parent b6ff54acc3
commit d43049c84d
2 changed files with 6 additions and 6 deletions
@@ -39,7 +39,7 @@ jobs:
shell: cmd shell: cmd
run: | run: |
call .github\scripts\msvc-env.bat ${{ matrix.bits }} call .github\scripts\msvc-env.bat ${{ matrix.bits }}
cmake -S . -B build -G Ninja -DFETCHCONTENT_BASE_DIR="${{ env.DEPS_ROOT_DIR }}" -DCMAKE_C_FLAGS="/nologo" cmake -B build -G Ninja -DFETCHCONTENT_BASE_DIR="${{ env.DEPS_ROOT_DIR }}" -DCMAKE_C_FLAGS="/nologo"
cmake --build build -- -k 0 cmake --build build -- -k 0
- name: Package binaries - name: Package binaries
working-directory: build working-directory: build
@@ -62,7 +62,7 @@ jobs:
./.github/scripts/install_deps.sh macos lld ./.github/scripts/install_deps.sh macos lld
- name: Build binaries - name: Build binaries
run: | run: |
cmake -S . -B build -G Ninja --preset macos-static -DFETCHCONTENT_BASE_DIR="${{ env.DEPS_ROOT_DIR }}" cmake -B build -G Ninja --preset macos-static -DFETCHCONTENT_BASE_DIR="${{ env.DEPS_ROOT_DIR }}"
cmake --build build -- -k 0 cmake --build build -- -k 0
strip rgb{asm,link,fix,gfx} strip rgb{asm,link,fix,gfx}
env: env:
+4 -4
View File
@@ -63,7 +63,7 @@ jobs:
# Note that since this is specific to our CI environment, the workaround is # Note that since this is specific to our CI environment, the workaround is
# better applied here than in our CMakeLists, where it could affect and break someone else. # better applied here than in our CMakeLists, where it could affect and break someone else.
run: | run: |
cmake -S . -B build -G Ninja --preset develop -DCMAKE_FIND_FRAMEWORK=LAST -DCMAKE_CXX_COMPILER=${{ matrix.cxx }} -DTESTS_OS_NAME=${{ matrix.os }} cmake -B build -G Ninja --preset develop -DCMAKE_FIND_FRAMEWORK=LAST -DCMAKE_CXX_COMPILER=${{ matrix.cxx }} -DTESTS_OS_NAME=${{ matrix.os }}
cmake --build build -- -k 0 cmake --build build -- -k 0
sudo cmake --install build --verbose sudo cmake --install build --verbose
- name: Package binaries - name: Package binaries
@@ -122,7 +122,7 @@ jobs:
enableCrossOsArchive: true enableCrossOsArchive: true
- name: Build & install - name: Build & install
run: | run: |
cmake -S . -B build -G Ninja --preset macos-static -DFETCHCONTENT_BASE_DIR="${{ env.DEPS_ROOT_DIR }}" -DTESTS_OS_NAME=macos cmake -B build -G Ninja --preset macos-static -DFETCHCONTENT_BASE_DIR="${{ env.DEPS_ROOT_DIR }}" -DTESTS_OS_NAME=macos
cmake --build build -- -k 0 cmake --build build -- -k 0
env: env:
LDFLAGS: -fuse-ld=lld # cmake/macos-static.cmake comments explain why we use lld. LDFLAGS: -fuse-ld=lld # cmake/macos-static.cmake comments explain why we use lld.
@@ -184,7 +184,7 @@ jobs:
shell: cmd shell: cmd
run: | # ASan seems to be broken on Windows, so we disable it. run: | # ASan seems to be broken on Windows, so we disable it.
call .github\scripts\msvc-env.bat ${{ matrix.bits }} call .github\scripts\msvc-env.bat ${{ matrix.bits }}
cmake -S . -B build -G Ninja --preset develop -DSANITIZERS=OFF -DTESTS_OS_NAME=${{ matrix.os }} ^ cmake -B build -G Ninja --preset develop -DSANITIZERS=OFF -DTESTS_OS_NAME=${{ matrix.os }} ^
-DFETCHCONTENT_BASE_DIR="${{ env.DEPS_ROOT_DIR }}" -DCMAKE_C_FLAGS="/nologo" -DFETCHCONTENT_BASE_DIR="${{ env.DEPS_ROOT_DIR }}" -DCMAKE_C_FLAGS="/nologo"
cmake --build build -- -k 0 cmake --build build -- -k 0
- name: Package binaries - name: Package binaries
@@ -372,7 +372,7 @@ jobs:
prepare: | prepare: |
.github/scripts/install_deps.sh freebsd .github/scripts/install_deps.sh freebsd
run: | # Leak detection is not supported on FreeBSD, so disable it. run: | # Leak detection is not supported on FreeBSD, so disable it.
cmake -S . -B build --preset develop -DTESTS_OS_NAME=freebsd cmake -B build --preset develop -DTESTS_OS_NAME=freebsd
cmake --build build --verbose -- -k cmake --build build --verbose -- -k
ASAN_OPTIONS=detect_leaks=0 ctest --test-dir build --schedule-random --label-exclude external ASAN_OPTIONS=detect_leaks=0 ctest --test-dir build --schedule-random --label-exclude external
cmake --install build --verbose cmake --install build --verbose