diff options
| author | Brad King <brad.king@kitware.com> | 2014-07-28 15:41:53 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-07-28 17:06:33 (GMT) |
| commit | 608cf8149ccbf8954926ab7c86fd658099a52f7b (patch) | |
| tree | e6cfc5358278c6240e77fa16f8aaca593a10ad1a /Source/cmGlobalXCodeGenerator.h | |
| parent | 55d6aa36a522f2dd7849ccd53d9e743a88f8c7a1 (diff) | |
| download | CMake-608cf8149ccbf8954926ab7c86fd658099a52f7b.zip CMake-608cf8149ccbf8954926ab7c86fd658099a52f7b.tar.gz CMake-608cf8149ccbf8954926ab7c86fd658099a52f7b.tar.bz2 | |
Xcode: Fix static library creation for Xcode 6 (#15038)
Xcode 6 introduced an 'OTHER_LIBTOOLFLAGS' setting for the "Other
Librarian Flags" of a static library. Now 'OTHER_LDFLAGS' are ignored.
Teach the Xcode generator to choose the correct name for the build
setting based on the type of target and the version of Xcode.
Inspired-by: Jamie Kirkpatrick <jkp@spotify.com>
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.h')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h index c9d20c2..a7b54e9 100644 --- a/Source/cmGlobalXCodeGenerator.h +++ b/Source/cmGlobalXCodeGenerator.h @@ -141,6 +141,7 @@ private: cmXCodeObject* buildPhases); void ForceLinkerLanguages(); void ForceLinkerLanguage(cmTarget& cmtarget); + const char* GetTargetLinkFlagsVar(cmTarget const& cmtarget) const; const char* GetTargetFileType(cmTarget& cmtarget); const char* GetTargetProductType(cmTarget& cmtarget); std::string AddConfigurations(cmXCodeObject* target, cmTarget& cmtarget); |