diff options
| author | Brad King <brad.king@kitware.com> | 2016-01-07 18:28:28 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-01-07 18:28:28 (GMT) |
| commit | 070f09f91ea2ea903ad503925e4870aaf541d291 (patch) | |
| tree | be2464f6559e807d0f347ff3f311b99e2fead36b /Source/cmGlobalXCodeGenerator.h | |
| parent | f7fbe0f6811dcd656f8cf772c6d57199c92f0a5e (diff) | |
| parent | d8bc26a065f1999698c9b499ca793f9adf740a9d (diff) | |
| download | CMake-070f09f91ea2ea903ad503925e4870aaf541d291.zip CMake-070f09f91ea2ea903ad503925e4870aaf541d291.tar.gz CMake-070f09f91ea2ea903ad503925e4870aaf541d291.tar.bz2 | |
Merge topic 'xcode-global-attribute-variant'
d8bc26a0 Xcode: Parse variant and genex for CMAKE_XCODE_ATTRIBUTE (#14947)
dc0ddb9e Xcode: Store configuration name along with XcodeObject (#14947)
28f98cee Xcode: Make CMAKE_XCODE_ATTRIBUTE calculation last step (#14947)
28db2268 Xcode: Factor out XCODE_ATTRIBUTE_ variant filter (#14947)
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.h')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h index b5fd13c..862746f 100644 --- a/Source/cmGlobalXCodeGenerator.h +++ b/Source/cmGlobalXCodeGenerator.h @@ -130,6 +130,7 @@ private: cmXCodeObject* CreateObject(cmXCodeObject::Type type); cmXCodeObject* CreateString(const std::string& s); cmXCodeObject* CreateObjectReference(cmXCodeObject*); + cmXCodeObject* CreateFlatClone(cmXCodeObject*); cmXCodeObject* CreateXCodeTarget(cmGeneratorTarget *gtgt, cmXCodeObject* buildPhases); void ForceLinkerLanguages(); @@ -152,6 +153,8 @@ private: std::string ExtractFlag(const char* flag, std::string& flags); std::string ExtractFlagRegex(const char* exp, int matchIndex, std::string& flags); + void FilterConfigurationAttribute(std::string const& configName, + std::string& attribute); void SortXCodeObjects(); // delete all objects in the this->XCodeObjects vector. void ClearXCodeObjects(); |