diff options
| author | Brad King <brad.king@kitware.com> | 2021-07-19 16:58:49 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-07-19 16:59:01 (GMT) |
| commit | a9900c836416e40dafb62b98ba8acaf464242631 (patch) | |
| tree | 55e2ae11dd928f5732a7239f1b863ab7a9313607 /Tests | |
| parent | 749e1473eb84ba72a071c2dcb861571975a5a906 (diff) | |
| parent | aa874dc6090cf6b6c9621572419738d105ff4ba3 (diff) | |
| download | CMake-a9900c836416e40dafb62b98ba8acaf464242631.zip CMake-a9900c836416e40dafb62b98ba8acaf464242631.tar.gz CMake-a9900c836416e40dafb62b98ba8acaf464242631.tar.bz2 | |
Merge topic 'cmake-presets-no-binary-dir-no-s'
aa874dc609 CMakePresets.json: Fix expansion issue with empty binaryDir
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6358
Diffstat (limited to 'Tests')
3 files changed, 18 insertions, 0 deletions
diff --git a/Tests/RunCMake/CMakePresets/OptionalBinaryDirFieldNoS.cmake b/Tests/RunCMake/CMakePresets/OptionalBinaryDirFieldNoS.cmake new file mode 100644 index 0000000..ae8a0de --- /dev/null +++ b/Tests/RunCMake/CMakePresets/OptionalBinaryDirFieldNoS.cmake @@ -0,0 +1,4 @@ +include(${CMAKE_CURRENT_LIST_DIR}/TestVariable.cmake) + +get_filename_component(_parent_dir "${CMAKE_SOURCE_DIR}" DIRECTORY) +test_variable(CMAKE_BINARY_DIR "" "${_parent_dir}/OptionalBinaryDirFieldNoS-build") diff --git a/Tests/RunCMake/CMakePresets/OptionalBinaryDirFieldNoS.json.in b/Tests/RunCMake/CMakePresets/OptionalBinaryDirFieldNoS.json.in new file mode 100644 index 0000000..0e3addd --- /dev/null +++ b/Tests/RunCMake/CMakePresets/OptionalBinaryDirFieldNoS.json.in @@ -0,0 +1,9 @@ +{ + "version": 3, + "configurePresets": [ + { + "name": "OptionalBinaryDirFieldNoS", + "generator": "@RunCMake_GENERATOR@" + } + ] +} diff --git a/Tests/RunCMake/CMakePresets/RunCMakeTest.cmake b/Tests/RunCMake/CMakePresets/RunCMakeTest.cmake index 3b9806a..31bd8a4 100644 --- a/Tests/RunCMake/CMakePresets/RunCMakeTest.cmake +++ b/Tests/RunCMake/CMakePresets/RunCMakeTest.cmake @@ -312,6 +312,11 @@ unset(CMakePresets_FILE) # Test optional generator and buildDir fields run_cmake_presets(OptionalBinaryDirField -B "${RunCMake_BINARY_DIR}/OptionalBinaryDirField/build") run_cmake_presets(OptionalGeneratorField -G "${RunCMake_GENERATOR}") +set(CMakePresets_NO_S_ARG TRUE) +set(CMakePresets_SOURCE_ARG "../OptionalBinaryDirFieldNoS") +run_cmake_presets(OptionalBinaryDirFieldNoS) +unset(CMakePresets_SOURCE_ARG) +unset(CMakePresets_NO_S_ARG) # Test the example from the documentation file(READ "${RunCMake_SOURCE_DIR}/../../../Help/manual/presets/example.json" _example) |