summaryrefslogtreecommitdiffstats
path: root/Source/CTest
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-10-29 15:45:49 (GMT)
committerBrad King <brad.king@kitware.com>2018-10-29 15:45:49 (GMT)
commit44cef5fd9204dab2872ca87ed3c56947218aeb75 (patch)
treec6ff7f681a497e9e3ba9079868e2a4616853741b /Source/CTest
parent97624af75125a6d6ad2fcc181fe8645bf1abfb5f (diff)
parent50572d638b3903f2c2af636dcfe9d3765fd87a7c (diff)
downloadCMake-44cef5fd9204dab2872ca87ed3c56947218aeb75.zip
CMake-44cef5fd9204dab2872ca87ed3c56947218aeb75.tar.gz
CMake-44cef5fd9204dab2872ca87ed3c56947218aeb75.tar.bz2
Merge branch 'set_directory_properties-script-mode' into release-3.13
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;