diff options
| author | Brad King <brad.king@kitware.com> | 2014-05-22 14:37:50 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-05-22 14:37:50 (GMT) |
| commit | 3ea9bde8450a28b58730230e9e73e4b8d439f701 (patch) | |
| tree | 07ba1cb727ab06c8767fe04020a523ae503ed389 /Source/cmLocalGenerator.cxx | |
| parent | 5ce40619db2d89f7cfbc2cd47968346fb22fa795 (diff) | |
| parent | b6e2e0d194c41cfff7dc8677dd411d5ea061602b (diff) | |
| download | CMake-3ea9bde8450a28b58730230e9e73e4b8d439f701.zip CMake-3ea9bde8450a28b58730230e9e73e4b8d439f701.tar.gz CMake-3ea9bde8450a28b58730230e9e73e4b8d439f701.tar.bz2 | |
Merge topic 'ninja-intel-ipo'
b6e2e0d1 Ninja: Fix Intel interprocedural optimization with static libraries
5d12b87b cmGeneratorTarget: Improve GetCreateRuleVariable API
c2eeb08b cmTarget: Add GetFeatureAsBool method
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 5d58265..e80b8ee 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -657,10 +657,10 @@ void cmLocalGenerator::AddBuildTargetRule(const std::string& llang, { std::string objs; std::vector<std::string> objVector; + std::string config = this->Makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"); // Add all the sources outputs to the depends of the target std::vector<cmSourceFile*> classes; - target.GetSourceFiles(classes, - this->Makefile->GetSafeDefinition("CMAKE_BUILD_TYPE")); + target.GetSourceFiles(classes, config); for(std::vector<cmSourceFile*>::const_iterator i = classes.begin(); i != classes.end(); ++i) { @@ -686,9 +686,7 @@ void cmLocalGenerator::AddBuildTargetRule(const std::string& llang, } } } - std::string createRule = "CMAKE_"; - createRule += llang; - createRule += target.GetCreateRuleVariable(); + std::string createRule = target.GetCreateRuleVariable(llang, config); bool useWatcomQuote = this->Makefile->IsOn(createRule+"_USE_WATCOM_QUOTE"); std::string targetName = target.Target->GetFullName(); // Executable : |