diff options
| author | David Cole <david.cole@kitware.com> | 2012-06-12 20:01:04 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-06-12 20:01:04 (GMT) |
| commit | c95d1baa194c8108841a8b973d3bbe50ca7d5666 (patch) | |
| tree | be3efd1ba2c1b58cb3d51242e246777527842efc /Source/cmNinjaTargetGenerator.cxx | |
| parent | c6f6929e31a3e8067633aa57cf0775bced9d8443 (diff) | |
| parent | bd3496300262bd26073ce03e020731c592249148 (diff) | |
| download | CMake-c95d1baa194c8108841a8b973d3bbe50ca7d5666.zip CMake-c95d1baa194c8108841a8b973d3bbe50ca7d5666.tar.gz CMake-c95d1baa194c8108841a8b973d3bbe50ca7d5666.tar.bz2 | |
Merge topic 'position-independent-targets'
bd34963 Refactor generation of shared library flags
55d7aa4 Add platform variable for flags specific to shared libraries
31d7a0f Add platform variables for position independent code flags
Diffstat (limited to 'Source/cmNinjaTargetGenerator.cxx')
| -rw-r--r-- | Source/cmNinjaTargetGenerator.cxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index 32b8f93..a362d13 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -140,11 +140,8 @@ cmNinjaTargetGenerator::ComputeFlagsForObject(cmSourceFile *source, // } // Add shared-library flags if needed. - { - bool shared = ((this->Target->GetType() == cmTarget::SHARED_LIBRARY) || - (this->Target->GetType() == cmTarget::MODULE_LIBRARY)); - this->GetLocalGenerator()->AddSharedFlags(flags, language.c_str(), shared); - } + this->LocalGenerator->AddCMP0018Flags(flags, this->Target, + language.c_str()); // TODO: Handle response file. // Add include directory flags. |