diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-08-04 21:43:56 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-08-26 17:45:51 (GMT) |
| commit | db4cb92bda8b43c3d66d27533622bb802e823589 (patch) | |
| tree | 4d539c364581b8299becd9b7c0f7dd97713f0197 /Source/cmLocalGenerator.cxx | |
| parent | e6ccbf6f30fb7b893b00a7c26fa165065eed4323 (diff) | |
| download | CMake-db4cb92bda8b43c3d66d27533622bb802e823589.zip CMake-db4cb92bda8b43c3d66d27533622bb802e823589.tar.gz CMake-db4cb92bda8b43c3d66d27533622bb802e823589.tar.bz2 | |
cmGeneratorTarget: Move compile options processing from cmTarget.
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index edb644d..89515ff 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -1094,6 +1094,10 @@ void cmLocalGenerator::AddCompileOptions( ) { std::string langFlagRegexVar = std::string("CMAKE_")+lang+"_FLAG_REGEX"; + + cmGeneratorTarget* gtgt = + this->GlobalGenerator->GetGeneratorTarget(target); + if(const char* langFlagRegexStr = this->Makefile->GetDefinition(langFlagRegexVar)) { @@ -1104,7 +1108,7 @@ void cmLocalGenerator::AddCompileOptions( { cmSystemTools::ParseWindowsCommandLine(targetFlags, opts); } - target->GetCompileOptions(opts, config, lang); + gtgt->GetCompileOptions(opts, config, lang); for(std::vector<std::string>::const_iterator i = opts.begin(); i != opts.end(); ++i) { @@ -1125,7 +1129,7 @@ void cmLocalGenerator::AddCompileOptions( this->AppendFlags(flags, targetFlags); } std::vector<std::string> opts; - target->GetCompileOptions(opts, config, lang); + gtgt->GetCompileOptions(opts, config, lang); for(std::vector<std::string>::const_iterator i = opts.begin(); i != opts.end(); ++i) { |