Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-14 10:47:59 +08:00
Code Issues Projects Releases Wiki Activity

presets: Fix buildPreset "jobs" field test case

Browse Source 
Avoid passing parallel build options to Make tools that do not support
them.
This commit is contained in:
Brad King
2021-06-08 07:09:31 -04:00
parent 13d112ea03
commit 93e396b402
3 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Tests/RunCMake/CMakeLists.txt
View File

@@ -809,9 +809,19 @@ add_RunCMake_test(PrecompileHeaders -DCMAKE_C_COMPILER_ID=${CMAKE_C_COMPILER_ID}
-DCMAKE_C_COMPILER_VERSION=${CMAKE_C_COMPILER_VERSION})
add_RunCMake_test("UnityBuild")
add_RunCMake_test(CMakePresets -DPYTHON_EXECUTABLE=${PYTHON_EXECUTABLE} -DCMake_TEST_JSON_SCHEMA=${CMake_TEST_JSON_SCHEMA})
add_RunCMake_test(CMakePresetsBuild -DPYTHON_EXECUTABLE=${PYTHON_EXECUTABLE} -DCMake_TEST_JSON_SCHEMA=${CMake_TEST_JSON_SCHEMA})
add_RunCMake_test(CMakePresetsTest -DPYTHON_EXECUTABLE=${PYTHON_EXECUTABLE} -DCMake_TEST_JSON_SCHEMA=${CMake_TEST_JSON_SCHEMA})
add_RunCMake_test(CMakePresets
-DPYTHON_EXECUTABLE=${PYTHON_EXECUTABLE}
-DCMake_TEST_JSON_SCHEMA=${CMake_TEST_JSON_SCHEMA}
)
add_RunCMake_test(CMakePresetsBuild
-DPYTHON_EXECUTABLE=${PYTHON_EXECUTABLE}
-DCMake_TEST_JSON_SCHEMA=${CMake_TEST_JSON_SCHEMA}
-DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}
)
add_RunCMake_test(CMakePresetsTest
-DPYTHON_EXECUTABLE=${PYTHON_EXECUTABLE}
-DCMake_TEST_JSON_SCHEMA=${CMake_TEST_JSON_SCHEMA}
)
if(${CMAKE_GENERATOR} MATCHES "Make|Ninja")
add_RunCMake_test(TransformDepfile)

2
Tests/RunCMake/CMakePresetsBuild/Good.json.in
View File

@@ -30,7 +30,7 @@
"description": "",
"inheritConfigureEnvironment": true,
"environment": {},
"jobs": 0,
@Good_json_jobs@
"targets": [],
"configuration": "",
"verbose": true,

8
Tests/RunCMake/CMakePresetsBuild/RunCMakeTest.cmake
View File

@@ -62,6 +62,14 @@ endfunction()
set(CMakePresets_SCHEMA_EXPECTED_RESULT 0)
if(RunCMake_GENERATOR MATCHES "NMake|Borland|Watcom")
set(Good_json_jobs [[]])
elseif(RunCMake_GENERATOR MATCHES "Make" AND CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
set(Good_json_jobs [["jobs": 1,]])
else()
set(Good_json_jobs [["jobs": 0,]])
endif()
run_cmake_build_presets(Good "default;other" "build-other;withEnvironment;noEnvironment;macros;vendorObject")
run_cmake_build_presets(InvalidConfigurePreset "default" "badConfigurePreset")