diff options
| author | Brad King <brad.king@kitware.com> | 2024-02-22 13:31:50 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-02-22 13:32:10 (GMT) |
| commit | 14ed766e12ac22abf9469dd67a6f99288f1ce1e8 (patch) | |
| tree | aa19cf9364582dc1f9f89dfb2c703ff75be867d0 /Tests/RunCMake | |
| parent | 62feb76394ade560ec5ffd8382720d38d39ed7b2 (diff) | |
| parent | 1a38ffc656351a177586a8037504c54125b8476a (diff) | |
| download | CMake-14ed766e12ac22abf9469dd67a6f99288f1ce1e8.zip CMake-14ed766e12ac22abf9469dd67a6f99288f1ce1e8.tar.gz CMake-14ed766e12ac22abf9469dd67a6f99288f1ce1e8.tar.bz2 | |
Merge topic 'preset-includes-macro-expansion'
1a38ffc656 presets: Expand more macros in the `include` directive
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9108
Diffstat (limited to 'Tests/RunCMake')
3 files changed, 16 insertions, 0 deletions
diff --git a/Tests/RunCMake/CMakePresets/IncludeExpansionOtherMacros-stdout.txt b/Tests/RunCMake/CMakePresets/IncludeExpansionOtherMacros-stdout.txt new file mode 100644 index 0000000..d3f1afc --- /dev/null +++ b/Tests/RunCMake/CMakePresets/IncludeExpansionOtherMacros-stdout.txt @@ -0,0 +1,5 @@ +^Not searching for unused variables given on the command line\. +Available configure presets: + + "Include" + "IncludeCommon"$ diff --git a/Tests/RunCMake/CMakePresets/IncludeExpansionOtherMacros.json.in b/Tests/RunCMake/CMakePresets/IncludeExpansionOtherMacros.json.in new file mode 100644 index 0000000..c5693b5 --- /dev/null +++ b/Tests/RunCMake/CMakePresets/IncludeExpansionOtherMacros.json.in @@ -0,0 +1,10 @@ +{ + "version": 9, + "include": ["${sourceDir}/IncludeCommon.json"], + "configurePresets": [ + { + "name": "Include", + "inherits": ["IncludeCommon"] + } + ] +} diff --git a/Tests/RunCMake/CMakePresets/RunCMakeTest.cmake b/Tests/RunCMake/CMakePresets/RunCMakeTest.cmake index 88027fb..42a4ed9 100644 --- a/Tests/RunCMake/CMakePresets/RunCMakeTest.cmake +++ b/Tests/RunCMake/CMakePresets/RunCMakeTest.cmake @@ -407,6 +407,7 @@ set(CMakePresets_EXTRA_FILES set(ENV{TEST_ENV_INCLUDE_DIR} ${RunCMake_BINARY_DIR}/IncludeExpansion) run_cmake_presets(IncludeExpansion --list-presets) unset(ENV{TEST_ENV_INCLUDE_DIR}) +run_cmake_presets(IncludeExpansionOtherMacros --list-presets) unset(CMakePresets_EXTRA_FILES) run_cmake_presets(IncludeNotFound) run_cmake_presets(IncludeCycle) |