瀏覽代碼

Fix for fix for issue #2336 - do not specify CMAKE_BUILD_TYPE when the ctest -C configuration type string is empty.

David Cole 16 年之前
父節點
當前提交
90f6a7270a
共有 1 個文件被更改,包括 2 次插入1 次删除
  1. 2 1
      Source/CTest/cmCTestConfigureCommand.cxx

+ 2 - 1
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 += " \"-DCMAKE_BUILD_TYPE:STRING=";
         cmakeConfigureCommand += this->CTest->GetConfigType();
         cmakeConfigureCommand += this->CTest->GetConfigType();