summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2005-02-04 22:38:41 (GMT)
committerBrad King <brad.king@kitware.com>2005-02-04 22:38:41 (GMT)
commitf6e8b36dcba508fc8710a94ca2e4e8698bbd11d3 (patch)
tree04ff23eeca30a79baef3e77194772fadabfbec44
parente708045e6ef2cb6145b0c8ba395d3ad9fb37025c (diff)
downloadCMake-f6e8b36dcba508fc8710a94ca2e4e8698bbd11d3.zip
CMake-f6e8b36dcba508fc8710a94ca2e4e8698bbd11d3.tar.gz
CMake-f6e8b36dcba508fc8710a94ca2e4e8698bbd11d3.tar.bz2
BUG: Fixed --build-target implementation to work with Visual Studio generators.
-rw-r--r--Source/cmCTest.cxx21
1 files changed, 19 insertions, 2 deletions
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index f3fbb41..4f17b25 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -1829,7 +1829,16 @@ int cmCTest::RunCMakeAndTest(std::string* outstring)
#endif
makeCommand += " ";
makeCommand += m_BuildProject;
- makeCommand += ".dsw /MAKE \"ALL_BUILD - ";
+ makeCommand += ".dsw /MAKE \"";
+ if(m_BuildTarget.size())
+ {
+ makeCommand += m_BuildTarget;
+ }
+ else
+ {
+ makeCommand += "ALL_BUILD";
+ }
+ makeCommand += " - ";
makeCommand += m_ConfigType;
if(m_BuildNoClean)
{
@@ -1860,7 +1869,15 @@ int cmCTest::RunCMakeAndTest(std::string* outstring)
{
makeCommand += "/rebuild ";
}
- makeCommand += m_ConfigType + " /project ALL_BUILD";
+ makeCommand += m_ConfigType + " /project ";
+ if(m_BuildTarget.size())
+ {
+ makeCommand += m_BuildTarget;
+ }
+ else
+ {
+ makeCommand += "ALL_BUILD";
+ }
}
else if (lowerCaseCommand.find("make") != std::string::npos)
{