summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalUnixMakefileGenerator3.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2006-06-01 19:51:24 (GMT)
committerBrad King <brad.king@kitware.com>2006-06-01 19:51:24 (GMT)
commit87d4d0e0394f30bb320b3939b1852a7cae2177cb (patch)
treeb513f5cdebbefb99b4215ef5934b9ecd06720f57 /Source/cmGlobalUnixMakefileGenerator3.cxx
parentbfb0ec58e819ae4d168337c5aadf73764599adc8 (diff)
downloadCMake-87d4d0e0394f30bb320b3939b1852a7cae2177cb.zip
CMake-87d4d0e0394f30bb320b3939b1852a7cae2177cb.tar.gz
CMake-87d4d0e0394f30bb320b3939b1852a7cae2177cb.tar.bz2
BUG: cmGlobalGenerator::Build should not always use the /fast target name because dependency checking is often required. It now takes an argument specifying whether to use the /fast target name, and the argument is currently only true for try-compiles.
Diffstat (limited to 'Source/cmGlobalUnixMakefileGenerator3.cxx')
-rw-r--r--Source/cmGlobalUnixMakefileGenerator3.cxx7
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index ac9e5b9..b86da5a 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -597,7 +597,7 @@ cmGlobalUnixMakefileGenerator3
std::string cmGlobalUnixMakefileGenerator3
::GenerateBuildCommand(const char* makeProgram, const char *projectName,
const char* additionalOptions, const char *targetName,
- const char* config, bool ignoreErrors)
+ const char* config, bool ignoreErrors, bool fast)
{
// Project name and config are not used yet.
(void)projectName;
@@ -644,7 +644,10 @@ std::string cmGlobalUnixMakefileGenerator3
lg->SetupPathConversions();
makeCommand += " \"";
std::string tname = targetName;
- tname += "/fast";
+ if(fast)
+ {
+ tname += "/fast";
+ }
tname = lg->Convert(tname.c_str(),cmLocalGenerator::HOME_OUTPUT,
cmLocalGenerator::MAKEFILE);
tname = lg->ConvertToMakeTarget(tname.c_str());