summaryrefslogtreecommitdiffstats
path: root/Source/CTest/cmCTestConfigureCommand.cxx
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2010-02-10 19:47:21 (GMT)
committerDavid Cole <david.cole@kitware.com>2010-02-10 19:47:21 (GMT)
commit90f6a7270a12ab14ffb5a75f60c423f3385e17d7 (patch)
tree349c98b6137380df23274d9fe5c5fe60cd09bc33 /Source/CTest/cmCTestConfigureCommand.cxx
parent2de33ebd5849cfa8819718638ab94213004c6f2d (diff)
downloadCMake-90f6a7270a12ab14ffb5a75f60c423f3385e17d7.zip
CMake-90f6a7270a12ab14ffb5a75f60c423f3385e17d7.tar.gz
CMake-90f6a7270a12ab14ffb5a75f60c423f3385e17d7.tar.bz2
Fix for fix for issue #2336 - do not specify CMAKE_BUILD_TYPE when the ctest -C configuration type string is empty.
Diffstat (limited to 'Source/CTest/cmCTestConfigureCommand.cxx')
-rw-r--r--Source/CTest/cmCTestConfigureCommand.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/CTest/cmCTestConfigureCommand.cxx b/Source/CTest/cmCTestConfigureCommand.cxx
index 147173f..9a668bc 100644
--- a/Source/CTest/cmCTestConfigureCommand.cxx
+++ b/Source/CTest/cmCTestConfigureCommand.cxx
@@ -132,7 +132,8 @@ cmCTestGenericHandler* cmCTestConfigureCommand::InitializeHandler()
}
}
- if (!multiConfig && !cmakeBuildTypeInOptions)
+ if (!multiConfig && !cmakeBuildTypeInOptions &&
+ !this->CTest->GetConfigType().empty())
{
cmakeConfigureCommand += " \"-DCMAKE_BUILD_TYPE:STRING=";
cmakeConfigureCommand += this->CTest->GetConfigType();