diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2020-10-22 15:04:40 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-10-22 15:05:09 (GMT) |
| commit | 609122007dc074739b394d2f70f674bbccca6073 (patch) | |
| tree | 066983f69d1ac1a43b1da6750cdca6fe5f5446b0 /Tests/RunCMake/CMakePresets/CMakePresets.json.in | |
| parent | 6af1185bb4a4cdc826763ea38db0e59e5ed3ffd7 (diff) | |
| parent | 638557cbfe0618d5a0fc6f9088e34aac708f5519 (diff) | |
| download | CMake-609122007dc074739b394d2f70f674bbccca6073.zip CMake-609122007dc074739b394d2f70f674bbccca6073.tar.gz CMake-609122007dc074739b394d2f70f674bbccca6073.tar.bz2 | |
Merge topic 'cmake-presets-invalid-macro' into release-3.19
638557cbfe CMakePresets.json: Properly report macro expansion errors
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5397
Diffstat (limited to 'Tests/RunCMake/CMakePresets/CMakePresets.json.in')
| -rw-r--r-- | Tests/RunCMake/CMakePresets/CMakePresets.json.in | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/Tests/RunCMake/CMakePresets/CMakePresets.json.in b/Tests/RunCMake/CMakePresets/CMakePresets.json.in index 18b9c3a..ea7df45 100644 --- a/Tests/RunCMake/CMakePresets/CMakePresets.json.in +++ b/Tests/RunCMake/CMakePresets/CMakePresets.json.in @@ -322,16 +322,6 @@ "binaryDir": "${sourceDir}/build" }, { - "name": "UnclosedMacro", - "generator": "@RunCMake_GENERATOR@", - "binaryDir": "${sourceDir" - }, - { - "name": "NoSuchMacro", - "generator": "@RunCMake_GENERATOR@", - "binaryDir": "${noexist}" - }, - { "name": "VendorMacro", "generator": "@RunCMake_GENERATOR@", "binaryDir": "$vendor{unknown.unknownMacro}" @@ -342,31 +332,6 @@ "binaryDir": "${sourceDir}/build" }, { - "name": "EnvCycle", - "generator": "@RunCMake_GENERATOR@", - "binaryDir": "${sourceDir}/build", - "environment": { - "ENV_1": "$env{ENV_2}", - "ENV_2": "$env{ENV_1}" - } - }, - { - "name": "EmptyEnv", - "generator": "@RunCMake_GENERATOR@", - "binaryDir": "${sourceDir}/build", - "cacheVariables": { - "MY_VAR": "$env{}" - } - }, - { - "name": "EmptyPenv", - "generator": "@RunCMake_GENERATOR@", - "binaryDir": "${sourceDir}/build", - "cacheVariables": { - "MY_VAR": "$penv{}" - } - }, - { "name": "UseHiddenPreset", "generator": "@RunCMake_GENERATOR@", "binaryDir": "${sourceDir}/build", |