diff options
| author | Brad King <brad.king@kitware.com> | 2021-05-06 14:08:38 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-05-06 14:08:51 (GMT) |
| commit | 01970128318372eb0aeb2a98fa4f7dde57ed10c9 (patch) | |
| tree | fa59f2b6d827d319e617e2fb46d34e4287979c4a | |
| parent | 4cab7a6fc554672130494bf12cdb877dbcbf7a44 (diff) | |
| parent | fa16b462f1ac2df9f14596657ae81efc2c934675 (diff) | |
| download | CMake-01970128318372eb0aeb2a98fa4f7dde57ed10c9.zip CMake-01970128318372eb0aeb2a98fa4f7dde57ed10c9.tar.gz CMake-01970128318372eb0aeb2a98fa4f7dde57ed10c9.tar.bz2 | |
Merge topic 'preset-test-example'
fa16b462f1 Tests: Fix RunCMake.CMakePresets example PATH format
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !6087
| -rw-r--r-- | Tests/RunCMake/CMakePresets/RunCMakeTest.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Tests/RunCMake/CMakePresets/RunCMakeTest.cmake b/Tests/RunCMake/CMakePresets/RunCMakeTest.cmake index 02051d9..3b9806a 100644 --- a/Tests/RunCMake/CMakePresets/RunCMakeTest.cmake +++ b/Tests/RunCMake/CMakePresets/RunCMakeTest.cmake @@ -316,6 +316,9 @@ run_cmake_presets(OptionalGeneratorField -G "${RunCMake_GENERATOR}") # Test the example from the documentation file(READ "${RunCMake_SOURCE_DIR}/../../../Help/manual/presets/example.json" _example) string(REPLACE "\"generator\": \"Ninja\"" "\"generator\": \"@RunCMake_GENERATOR@\"" _example "${_example}") +if(CMAKE_HOST_WIN32) + string(REPLACE [["PATH": "$env{HOME}/ninja/bin:$penv{PATH}"]] [["PATH": "$env{HOME}/ninja/bin;$penv{PATH}"]] _example "${_example}") +endif() file(WRITE "${RunCMake_BINARY_DIR}/example.json.in" "${_example}") set(CMakePresets_FILE "${RunCMake_BINARY_DIR}/example.json.in") run_cmake_presets(DocumentationExample --preset=default) |