diff options
| author | Brad King <brad.king@kitware.com> | 2016-06-09 13:18:26 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-06-09 13:18:26 (GMT) |
| commit | c21397b2df9470bde02d19175e393110871cee91 (patch) | |
| tree | 16fde701eb5e6e5a350ab821a4d6f2266abf99ff /Source/cmake.cxx | |
| parent | 065bb0ffebb51c0a3b90e8be3958095afaf4231a (diff) | |
| parent | b0d3e693f1ab466451c7a0d17bbbdd3cae76e93a (diff) | |
| download | CMake-c21397b2df9470bde02d19175e393110871cee91.zip CMake-c21397b2df9470bde02d19175e393110871cee91.tar.gz CMake-c21397b2df9470bde02d19175e393110871cee91.tar.bz2 | |
Merge topic 'refactor-cmLocalGenerator-flags'
b0d3e693 cmLocalGenerator: Pass configuration to GetTargetFlags
Diffstat (limited to 'Source/cmake.cxx')
| -rw-r--r-- | Source/cmake.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index b763426..ecbdc61 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -481,6 +481,9 @@ bool cmake::FindPackage(const std::vector<std::string>& args) mf->AddLinkLibraryForTarget(targetName, *libIt, GENERAL_LibraryType); } + std::string buildType = mf->GetSafeDefinition("CMAKE_BUILD_TYPE"); + buildType = cmSystemTools::UpperCase(buildType); + std::string linkLibs; std::string frameworkPath; std::string linkPath; @@ -489,8 +492,8 @@ bool cmake::FindPackage(const std::vector<std::string>& args) gg->CreateGenerationObjects(); cmGeneratorTarget* gtgt = gg->FindGeneratorTarget(tgt->GetName()); cmLocalGenerator* lg = gtgt->GetLocalGenerator(); - lg->GetTargetFlags(linkLibs, frameworkPath, linkPath, flags, linkFlags, - gtgt, false); + lg->GetTargetFlags(buildType, linkLibs, frameworkPath, linkPath, flags, + linkFlags, gtgt, false); linkLibs = frameworkPath + linkPath + linkLibs; printf("%s\n", linkLibs.c_str()); |