diff options
author | Brad King <brad.king@kitware.com> | 2009-07-03 12:41:10 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2009-07-03 12:41:10 (GMT) |
commit | 11d1063452178b00ac66304da337c1cb56dfa469 (patch) | |
tree | ea97e52e9bba286f733b26455ca2b457c678931b /Source/cmMakefileExecutableTargetGenerator.cxx | |
parent | 789eaf157c1587e4eff9c2627c50e537fc56ba71 (diff) | |
download | CMake-11d1063452178b00ac66304da337c1cb56dfa469.zip CMake-11d1063452178b00ac66304da337c1cb56dfa469.tar.gz CMake-11d1063452178b00ac66304da337c1cb56dfa469.tar.bz2 |
ENH: Create cmMakefileTargetGenerator::ConfigName
This member stores the build configuration for which Makefiles are being
generated. It saves repeated lookup of the equivalent member from
cmLocalUnixMakefileGenerator3, making code shorter and more readable.
Diffstat (limited to 'Source/cmMakefileExecutableTargetGenerator.cxx')
-rw-r--r-- | Source/cmMakefileExecutableTargetGenerator.cxx | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx index 332c116..d64bc36 100644 --- a/Source/cmMakefileExecutableTargetGenerator.cxx +++ b/Source/cmMakefileExecutableTargetGenerator.cxx @@ -32,7 +32,7 @@ cmMakefileExecutableTargetGenerator this->CustomCommandDriver = OnDepends; this->Target->GetExecutableNames( this->TargetNameOut, this->TargetNameReal, this->TargetNameImport, - this->TargetNamePDB, this->LocalGenerator->ConfigurationName.c_str()); + this->TargetNamePDB, this->ConfigName); if(this->Target->IsAppBundleOnApple()) { @@ -123,7 +123,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink) std::string targetNamePDB; this->Target->GetExecutableNames (targetName, targetNameReal, targetNameImport, targetNamePDB, - this->LocalGenerator->ConfigurationName.c_str()); + this->ConfigName); // Construct the full path version of the names. std::string outpath = this->Target->GetDirectory(); @@ -212,7 +212,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink) // Add flags to create an executable. this->LocalGenerator-> AddConfigVariableFlags(linkFlags, "CMAKE_EXE_LINKER_FLAGS", - this->LocalGenerator->ConfigurationName.c_str()); + this->ConfigName); if(this->Target->GetPropertyAsBool("WIN32_EXECUTABLE")) @@ -238,15 +238,13 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink) // Add language-specific flags. this->LocalGenerator - ->AddLanguageFlags(flags, linkLanguage, - this->LocalGenerator->ConfigurationName.c_str()); + ->AddLanguageFlags(flags, linkLanguage, this->ConfigName); // Add target-specific linker flags. this->LocalGenerator->AppendFlags (linkFlags, this->Target->GetProperty("LINK_FLAGS")); std::string linkFlagsConfig = "LINK_FLAGS_"; - linkFlagsConfig += - cmSystemTools::UpperCase(this->LocalGenerator->ConfigurationName.c_str()); + linkFlagsConfig += cmSystemTools::UpperCase(this->ConfigName); this->LocalGenerator->AppendFlags (linkFlags, this->Target->GetProperty(linkFlagsConfig.c_str())); |