mirrors/Catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-04-29 12:03:53 +00:00
Code Issues Releases Wiki Activity

Use more modern -S for specifying CMake source dir

Browse Source
This commit is contained in:
Chris Thrasher 2025-04-26 10:59:42 -06:00
parent 8cfca70ae8
commit 5c97a8583d
No known key found for this signature in database
GPG Key ID: 56FB686C9DFC8E2C
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/linux-other-builds.yml vendored
View File

@ -86,7 +86,7 @@ jobs:
# Note: $GITHUB_WORKSPACE is distinct from ${{runner.workspace}}. # Note: $GITHUB_WORKSPACE is distinct from ${{runner.workspace}}.
# This is important # This is important
run: | run: |
cmake -Bbuild -H$GITHUB_WORKSPACE \ cmake -Bbuild -S$GITHUB_WORKSPACE \
-DCMAKE_BUILD_TYPE=${{matrix.build_type}} \ -DCMAKE_BUILD_TYPE=${{matrix.build_type}} \
-DCMAKE_CXX_STANDARD=${{matrix.std}} \ -DCMAKE_CXX_STANDARD=${{matrix.std}} \
-DCMAKE_CXX_STANDARD_REQUIRED=ON \ -DCMAKE_CXX_STANDARD_REQUIRED=ON \
@ -133,7 +133,7 @@ jobs:
clangtidy="clang-tidy-${{matrix.version}};-use-color" clangtidy="clang-tidy-${{matrix.version}};-use-color"
# Use a dummy compiler/linker/ar/ranlib to effectively disable the # Use a dummy compiler/linker/ar/ranlib to effectively disable the
# compilation and only run clang-tidy. # compilation and only run clang-tidy.
cmake -Bbuild -H$GITHUB_WORKSPACE \ cmake -Bbuild -S$GITHUB_WORKSPACE \
-DCMAKE_BUILD_TYPE=${{matrix.build_type}} \ -DCMAKE_BUILD_TYPE=${{matrix.build_type}} \
-DCMAKE_CXX_STANDARD=${{matrix.std}} \ -DCMAKE_CXX_STANDARD=${{matrix.std}} \
-DCMAKE_CXX_STANDARD_REQUIRED=ON \ -DCMAKE_CXX_STANDARD_REQUIRED=ON \

2
.github/workflows/linux-simple-builds.yml vendored
View File

@ -105,7 +105,7 @@ jobs:
# Note: $GITHUB_WORKSPACE is distinct from ${{runner.workspace}}. # Note: $GITHUB_WORKSPACE is distinct from ${{runner.workspace}}.
# This is important # This is important
run: | run: |
cmake -Bbuild -H$GITHUB_WORKSPACE \ cmake -Bbuild -S$GITHUB_WORKSPACE \
-DCMAKE_BUILD_TYPE=${{matrix.build_type}} \ -DCMAKE_BUILD_TYPE=${{matrix.build_type}} \
-DCMAKE_CXX_STANDARD=${{matrix.std}} \ -DCMAKE_CXX_STANDARD=${{matrix.std}} \
-DCMAKE_CXX_STANDARD_REQUIRED=ON \ -DCMAKE_CXX_STANDARD_REQUIRED=ON \

2
.github/workflows/mac-builds-m1.yml vendored
View File

@ -26,7 +26,7 @@ jobs:
CXX: ${{matrix.cxx}} CXX: ${{matrix.cxx}}
CXXFLAGS: ${{matrix.cxxflags}} CXXFLAGS: ${{matrix.cxxflags}}
run: | run: |
cmake -Bbuild -H$GITHUB_WORKSPACE \ cmake -Bbuild -S$GITHUB_WORKSPACE \
-DCMAKE_BUILD_TYPE=${{matrix.build_type}} \ -DCMAKE_BUILD_TYPE=${{matrix.build_type}} \
-DCMAKE_CXX_STANDARD=${{matrix.std}} \ -DCMAKE_CXX_STANDARD=${{matrix.std}} \
-DCMAKE_CXX_STANDARD_REQUIRED=ON \ -DCMAKE_CXX_STANDARD_REQUIRED=ON \

2
.github/workflows/mac-builds.yml vendored
View File

@ -30,7 +30,7 @@ jobs:
CXX: ${{matrix.cxx}} CXX: ${{matrix.cxx}}
CXXFLAGS: ${{matrix.cxxflags}} CXXFLAGS: ${{matrix.cxxflags}}
run: | run: |
cmake -Bbuild -H$GITHUB_WORKSPACE \ cmake -Bbuild -S$GITHUB_WORKSPACE \
-DCMAKE_BUILD_TYPE=${{matrix.build_type}} \ -DCMAKE_BUILD_TYPE=${{matrix.build_type}} \
-DCMAKE_CXX_STANDARD=${{matrix.std}} \ -DCMAKE_CXX_STANDARD=${{matrix.std}} \
-DCMAKE_CXX_STANDARD_REQUIRED=ON \ -DCMAKE_CXX_STANDARD_REQUIRED=ON \

2
tests/TestScripts/ConfigureTestsCommon.py
View File

@ -15,7 +15,7 @@ import subprocess
def configure_and_build(source_path: str, project_path: str, options: List[Tuple[str, str]]): def configure_and_build(source_path: str, project_path: str, options: List[Tuple[str, str]]):
base_configure_cmd = ['cmake', base_configure_cmd = ['cmake',
'-B{}'.format(project_path), '-B{}'.format(project_path),
'-H{}'.format(source_path), '-S{}'.format(source_path),
'-DCMAKE_BUILD_TYPE=Debug', '-DCMAKE_BUILD_TYPE=Debug',
'-DCATCH_DEVELOPMENT_BUILD=ON'] '-DCATCH_DEVELOPMENT_BUILD=ON']
for option, value in options: for option, value in options:

8
tools/misc/appveyorBuildConfigurationScript.bat
View File

@ -8,14 +8,14 @@ SETLOCAL EnableDelayedExpansion
if "%CONFIGURATION%"=="Debug" ( if "%CONFIGURATION%"=="Debug" (
if "%coverage%"=="1" ( if "%coverage%"=="1" (
@REM # coverage needs to build the special helper as well as the main @REM # coverage needs to build the special helper as well as the main
cmake -Htools/misc -Bbuild-misc -A%PLATFORM% || exit /b !ERRORLEVEL! cmake -Stools/misc -Bbuild-misc -A%PLATFORM% || exit /b !ERRORLEVEL!
cmake --build build-misc || exit /b !ERRORLEVEL! cmake --build build-misc || exit /b !ERRORLEVEL!
cmake -H. -BBuild -A%PLATFORM% -DCATCH_TEST_USE_WMAIN=%wmain% -DMEMORYCHECK_COMMAND=build-misc\Debug\CoverageHelper.exe -DMEMORYCHECK_COMMAND_OPTIONS=--sep-- -DMEMORYCHECK_TYPE=Valgrind -DCATCH_BUILD_EXAMPLES=%examples% -DCATCH_BUILD_EXTRA_TESTS=%examples% -DCATCH_ENABLE_CONFIGURE_TESTS=%configure_tests% -DCATCH_DEVELOPMENT_BUILD=ON || exit /b !ERRORLEVEL! cmake -S. -BBuild -A%PLATFORM% -DCATCH_TEST_USE_WMAIN=%wmain% -DMEMORYCHECK_COMMAND=build-misc\Debug\CoverageHelper.exe -DMEMORYCHECK_COMMAND_OPTIONS=--sep-- -DMEMORYCHECK_TYPE=Valgrind -DCATCH_BUILD_EXAMPLES=%examples% -DCATCH_BUILD_EXTRA_TESTS=%examples% -DCATCH_ENABLE_CONFIGURE_TESTS=%configure_tests% -DCATCH_DEVELOPMENT_BUILD=ON || exit /b !ERRORLEVEL!
) else ( ) else (
@REM # We know that coverage is 0 @REM # We know that coverage is 0
cmake -H. -BBuild -A%PLATFORM% -DCATCH_TEST_USE_WMAIN=%wmain% -DCATCH_BUILD_EXAMPLES=%examples% -DCATCH_BUILD_EXTRA_TESTS=%examples% -DCATCH_BUILD_SURROGATES=%surrogates% -DCATCH_DEVELOPMENT_BUILD=ON -DCATCH_ENABLE_CONFIGURE_TESTS=%configure_tests% || exit /b !ERRORLEVEL! cmake -S. -BBuild -A%PLATFORM% -DCATCH_TEST_USE_WMAIN=%wmain% -DCATCH_BUILD_EXAMPLES=%examples% -DCATCH_BUILD_EXTRA_TESTS=%examples% -DCATCH_BUILD_SURROGATES=%surrogates% -DCATCH_DEVELOPMENT_BUILD=ON -DCATCH_ENABLE_CONFIGURE_TESTS=%configure_tests% || exit /b !ERRORLEVEL!
) )
) )
if "%CONFIGURATION%"=="Release" ( if "%CONFIGURATION%"=="Release" (
cmake -H. -BBuild -A%PLATFORM% -DCATCH_TEST_USE_WMAIN=%wmain% -DCATCH_DEVELOPMENT_BUILD=ON || exit /b !ERRORLEVEL! cmake -S. -BBuild -A%PLATFORM% -DCATCH_TEST_USE_WMAIN=%wmain% -DCATCH_DEVELOPMENT_BUILD=ON || exit /b !ERRORLEVEL!
) )