diff options
| author | UfoXp <ufoxp@me.me> | 2017-07-05 16:36:30 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-07-10 15:33:56 (GMT) |
| commit | 2c82d9c81f869303d3202501665acd91311d7714 (patch) | |
| tree | 1cb01ae0275e661d23da20326406e55a6ff98043 | |
| parent | 295d9bf2bd795da551d5ac266c53eeac2de45a71 (diff) | |
| download | CMake-2c82d9c81f869303d3202501665acd91311d7714.zip CMake-2c82d9c81f869303d3202501665acd91311d7714.tar.gz CMake-2c82d9c81f869303d3202501665acd91311d7714.tar.bz2 | |
Add more extensions to Resources source group by default
Extend the Resources group regex to match pdf, png, jpeg, jpg,
storyboards, and xcassets. This cleans up more complex Xcode projects a
lot.
While at it, factor the regular expressions for both "Resources" and
"Source Files" into macros.
| -rw-r--r-- | Source/cmMakefile.cxx | 6 | ||||
| -rw-r--r-- | Source/cmSourceFile.h | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 4a0cab3..caf8993 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -87,12 +87,10 @@ cmMakefile::cmMakefile(cmGlobalGenerator* globalGenerator, #if defined(CMAKE_BUILD_WITH_CMAKE) this->AddSourceGroup("", "^.*$"); - this->AddSourceGroup("Source Files", - "\\.(C|M|c|c\\+\\+|cc|cpp|cxx|f|f90|for|fpp" - "|ftn|m|mm|rc|def|r|odl|idl|hpj|bat)$"); + this->AddSourceGroup("Source Files", CM_SOURCE_REGEX); this->AddSourceGroup("Header Files", CM_HEADER_REGEX); this->AddSourceGroup("CMake Rules", "\\.rule$"); - this->AddSourceGroup("Resources", "\\.plist$"); + this->AddSourceGroup("Resources", CM_RESOURCE_REGEX); this->AddSourceGroup("Object Files", "\\.(lo|o|obj)$"); this->ObjectLibrariesSourceGroupIndex = this->SourceGroups.size(); diff --git a/Source/cmSourceFile.h b/Source/cmSourceFile.h index 0be659c..e739d18 100644 --- a/Source/cmSourceFile.h +++ b/Source/cmSourceFile.h @@ -120,4 +120,10 @@ private: // TODO: Factor out into platform information modules. #define CM_HEADER_REGEX "\\.(h|hh|h\\+\\+|hm|hpp|hxx|in|txx|inl)$" +#define CM_SOURCE_REGEX \ + "\\.(C|M|c|c\\+\\+|cc|cpp|cxx|f|f90|for|fpp|ftn|m|mm|rc|def|r|odl|idl|hpj" \ + "|bat)$" + +#define CM_RESOURCE_REGEX "\\.(pdf|plist|png|jpeg|jpg|storyboard|xcassets)$" + #endif |