diff options
author | Brad King <brad.king@kitware.com> | 2018-10-29 15:15:10 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2018-10-29 15:37:32 (GMT) |
commit | 50572d638b3903f2c2af636dcfe9d3765fd87a7c (patch) | |
tree | c49c51130aae4e2a207995783bea9106c7fd2a44 /Source/cmCommands.cxx | |
parent | e4a0d8f39987a4574336892106b39781fd2d4e50 (diff) | |
download | CMake-50572d638b3903f2c2af636dcfe9d3765fd87a7c.zip CMake-50572d638b3903f2c2af636dcfe9d3765fd87a7c.tar.gz CMake-50572d638b3903f2c2af636dcfe9d3765fd87a7c.tar.bz2 |
set_directory_properties: Restore in script mode
Since commit v3.10.0-rc1~391^2~3 (Add directory property 'LABELS' and
CMAKE_DIRECTORY_LABELS variable, 2017-06-23) this command was
accidentally not allowed in script mode. It was dropped because
`ctest -S` mode needs to start with CMake's normal script mode and
then replace the `set_directory_properties` implementation. Restore
the normal `set_directory_properties` in script mode and then add
special logic to replace it in ctest. Also add a test case.
Fixes: #18523
Diffstat (limited to 'Source/cmCommands.cxx')
-rw-r--r-- | Source/cmCommands.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmCommands.cxx b/Source/cmCommands.cxx index 8a7d9bd..ab0378b 100644 --- a/Source/cmCommands.cxx +++ b/Source/cmCommands.cxx @@ -147,6 +147,8 @@ void GetScriptingCommands(cmState* state) state->AddBuiltinCommand("separate_arguments", new cmSeparateArgumentsCommand); state->AddBuiltinCommand("set", new cmSetCommand); + state->AddBuiltinCommand("set_directory_properties", + new cmSetDirectoryPropertiesCommand); state->AddBuiltinCommand("set_property", new cmSetPropertyCommand); state->AddBuiltinCommand("site_name", new cmSiteNameCommand); state->AddBuiltinCommand("string", new cmStringCommand); @@ -229,8 +231,6 @@ void GetProjectCommands(cmState* state) state->AddBuiltinCommand("install_targets", new cmInstallTargetsCommand); state->AddBuiltinCommand("link_directories", new cmLinkDirectoriesCommand); state->AddBuiltinCommand("project", new cmProjectCommand); - state->AddBuiltinCommand("set_directory_properties", - new cmSetDirectoryPropertiesCommand); state->AddBuiltinCommand("set_source_files_properties", new cmSetSourceFilesPropertiesCommand); state->AddBuiltinCommand("set_target_properties", |