diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2016-06-07 14:30:58 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-06-08 20:18:31 (GMT) |
| commit | b0d3e693f1ab466451c7a0d17bbbdd3cae76e93a (patch) | |
| tree | b2eca1da7409310744f707274e83b48884053662 /Source/cmLocalGenerator.cxx | |
| parent | ba92e11f8b461513566d5cc3c0b53b2215bb85f7 (diff) | |
| download | CMake-b0d3e693f1ab466451c7a0d17bbbdd3cae76e93a.zip CMake-b0d3e693f1ab466451c7a0d17bbbdd3cae76e93a.tar.gz CMake-b0d3e693f1ab466451c7a0d17bbbdd3cae76e93a.tar.bz2 | |
cmLocalGenerator: Pass configuration to GetTargetFlags
Move the configuration lookup to call sites. This will allow
multi-configuration callers to use the method.
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index b748b9c..b369420 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -1152,13 +1152,11 @@ void cmLocalGenerator::GetStaticLibraryFlags(std::string& flags, } void cmLocalGenerator::GetTargetFlags( - std::string& linkLibs, std::string& flags, std::string& linkFlags, - std::string& frameworkPath, std::string& linkPath, cmGeneratorTarget* target, - bool useWatcomQuote) + const std::string& config, std::string& linkLibs, std::string& flags, + std::string& linkFlags, std::string& frameworkPath, std::string& linkPath, + cmGeneratorTarget* target, bool useWatcomQuote) { - std::string buildType = - this->Makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"); - buildType = cmSystemTools::UpperCase(buildType); + const std::string buildType = cmSystemTools::UpperCase(config); const char* libraryLinkVariable = "CMAKE_SHARED_LINKER_FLAGS"; // default to shared library |