summaryrefslogtreecommitdiffstats
path: root/Source/CTest
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/CTest
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/CTest')
-rw-r--r--Source/CTest/cmCTestTestHandler.cxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
index 7fb5e80..c936910 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -1686,6 +1686,7 @@ void cmCTestTestHandler::GetListOfTests()
cm.GetState()->AddBuiltinCommand("set_tests_properties", newCom4);
// Add handler for SET_DIRECTORY_PROPERTIES
+ cm.GetState()->RemoveBuiltinCommand("set_directory_properties");
cmCTestSetDirectoryPropertiesCommand* newCom5 =
new cmCTestSetDirectoryPropertiesCommand;
newCom5->TestHandler = this;