diff options
| author | Gregor Jasny <gjasny@googlemail.com> | 2015-04-07 19:14:52 +0200 |
|---|---|---|
| committer | Gregor Jasny <gjasny@googlemail.com> | 2015-04-17 21:49:05 +0200 |
| commit | 7b68c8df6b78951e6d04eea62c3d5cc056796993 (patch) | |
| tree | 2d56f09b427179e49f495c802f6ad005f265fb15 /Source/cmGlobalXCodeGenerator.h | |
| parent | 48040c19d5f1bcec55a130fcf8f8d83db27291b4 (diff) | |
| download | cmake-7b68c8df6b78951e6d04eea62c3d5cc056796993.tar.gz | |
Xcode: Sort Xcode objects by Id
this patch series aims to minimize deltas between the CMake Xcode
generator and Xcode itself. It was started by the observation that
if one makes any change to the project within Xcode (e.g. to see
how a variable is called internally) the user cannot diff the CMake
project and the one stored by Xcode afterwards.
Xcode keeps the objects ordered by the object id.
Because cmake stores them into an unordered container
at creation time they must be sorted before writing the
pbxproj file.
I tested this series with Xcode 6.3 and Xcode 3.2. Both show a
reduced diff after this series was applied.
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 b272f6a942..1a69fce825 100644 --- a/Source/cmGlobalXCodeGenerator.h +++ b/Source/cmGlobalXCodeGenerator.h @@ -150,6 +150,7 @@ private: cmXCodeObject* buildSettings, const std::string& buildType); std::string ExtractFlag(const char* flag, std::string& flags); + void SortXCodeObjects(); // delete all objects in the this->XCodeObjects vector. void ClearXCodeObjects(); bool CreateXCodeObjects(cmLocalGenerator* root, |