summaryrefslogtreecommitdiffstats
path: root/Source/cmCommands.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-10-30 15:01:26 (GMT)
committerKitware Robot <kwrobot@kitware.com>2018-10-30 15:01:36 (GMT)
commit87dfd53b276bff00e5e018b29043d05cf503018e (patch)
tree6f71cc12a5995d8807a3bcf3610d5e789c7c5b42 /Source/cmCommands.cxx
parent157e3e1bd6465703ca75fcf8cf7ea2f5271a5c65 (diff)
parent50572d638b3903f2c2af636dcfe9d3765fd87a7c (diff)
downloadCMake-87dfd53b276bff00e5e018b29043d05cf503018e.zip
CMake-87dfd53b276bff00e5e018b29043d05cf503018e.tar.gz
CMake-87dfd53b276bff00e5e018b29043d05cf503018e.tar.bz2
Merge topic 'set_directory_properties-script-mode'
50572d638b set_directory_properties: Restore in script mode Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2544
Diffstat (limited to 'Source/cmCommands.cxx')
-rw-r--r--Source/cmCommands.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmCommands.cxx b/Source/cmCommands.cxx
index 873372f..63c5397 100644
--- a/Source/cmCommands.cxx
+++ b/Source/cmCommands.cxx
@@ -151,6 +151,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);
@@ -240,8 +242,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",