diff options
| author | Alex Neundorf <neundorf@kde.org> | 2012-09-24 20:06:20 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-09-30 14:27:44 (GMT) |
| commit | 80112da54e1aa8e64f73a2a5a6a4f73431ac6764 (patch) | |
| tree | ab12483eed9e9950336b4dc511418fd1423d74d1 /Source/cmMakefileLibraryTargetGenerator.cxx | |
| parent | 955b96629e05bf2ddb6c94fa7a130e2b5b744782 (diff) | |
| parent | e83cc94dcd250e90143450bc916353b449043081 (diff) | |
| download | CMake-80112da54e1aa8e64f73a2a5a6a4f73431ac6764.zip CMake-80112da54e1aa8e64f73a2a5a6a4f73431ac6764.tar.gz CMake-80112da54e1aa8e64f73a2a5a6a4f73431ac6764.tar.bz2 | |
Merge topic 'AutomocUseTargetProperties' into export-sets
Conflicts:
Source/cmGlobalGenerator.h
Diffstat (limited to 'Source/cmMakefileLibraryTargetGenerator.cxx')
| -rw-r--r-- | Source/cmMakefileLibraryTargetGenerator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx index 577e5fd..368d6fc 100644 --- a/Source/cmMakefileLibraryTargetGenerator.cxx +++ b/Source/cmMakefileLibraryTargetGenerator.cxx @@ -546,7 +546,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules if(this->Target->GetType() != cmTarget::STATIC_LIBRARY) { this->LocalGenerator - ->OutputLinkLibraries(linklibs, *this->Target, relink); + ->OutputLinkLibraries(linklibs, *this->GeneratorTarget, relink); } // Construct object file lists that may be needed to expand the @@ -625,7 +625,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules std::string langFlags; this->AddFeatureFlags(langFlags, linkLanguage); - this->LocalGenerator->AddArchitectureFlags(langFlags, this->Target, + this->LocalGenerator->AddArchitectureFlags(langFlags, this->GeneratorTarget, linkLanguage, this->ConfigName); // remove any language flags that might not work with the |