This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via 2e29d71c33f54eb84b1fae5bbb3c362b4f994f29 (commit) via 0ae4632119ba5300995ec5ddd5513a44bfd2a198 (commit) via 7ecac703cec8bde71f8d11c1a8fa34bfa077edee (commit) from 3ab7ed32396004ac7534e466657bbfb7f95b8a76 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2e29d71c33f54eb84b1fae5bbb3c362b4f994f29 commit 2e29d71c33f54eb84b1fae5bbb3c362b4f994f29 Merge: 3ab7ed3 0ae4632 Author: Gregor Jasny <gja...@googlemail.com> AuthorDate: Sat Dec 10 12:40:27 2016 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Sat Dec 10 12:40:27 2016 -0500 Merge topic 'xcode-message-extension' into next 0ae46321 Xcode: Add target property to override explicitFileType 7ecac703 Xcode: Add target property to override productType https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0ae4632119ba5300995ec5ddd5513a44bfd2a198 commit 0ae4632119ba5300995ec5ddd5513a44bfd2a198 Author: Gregor Jasny <gja...@googlemail.com> AuthorDate: Sat Dec 3 23:45:55 2016 +0100 Commit: Gregor Jasny <gja...@googlemail.com> CommitDate: Sun Dec 4 00:13:51 2016 +0100 Xcode: Add target property to override explicitFileType diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst index 292a85b..70bd279 100644 --- a/Help/manual/cmake-properties.7.rst +++ b/Help/manual/cmake-properties.7.rst @@ -294,6 +294,7 @@ Properties on Targets /prop_tgt/WIN32_EXECUTABLE /prop_tgt/WINDOWS_EXPORT_ALL_SYMBOLS /prop_tgt/XCODE_ATTRIBUTE_an-attribute + /prop_tgt/XCODE_EXPLICIT_FILE_TYPE /prop_tgt/XCODE_PRODUCT_TYPE /prop_tgt/XCTEST diff --git a/Help/prop_tgt/XCODE_EXPLICIT_FILE_TYPE.rst b/Help/prop_tgt/XCODE_EXPLICIT_FILE_TYPE.rst new file mode 100644 index 0000000..dc92902 --- /dev/null +++ b/Help/prop_tgt/XCODE_EXPLICIT_FILE_TYPE.rst @@ -0,0 +1,8 @@ +XCODE_EXPLICIT_FILE_TYPE +------------------------ + +Set the Xcode ``explicitFileType`` attribute on its reference to a +target. CMake computes a default based on target type but +can be told explicitly with this property. + +See also :prop_tgt:`XCODE_PRODUCT_TYPE`. diff --git a/Help/prop_tgt/XCODE_PRODUCT_TYPE.rst b/Help/prop_tgt/XCODE_PRODUCT_TYPE.rst index 1fbf001..f4ef5c0 100644 --- a/Help/prop_tgt/XCODE_PRODUCT_TYPE.rst +++ b/Help/prop_tgt/XCODE_PRODUCT_TYPE.rst @@ -4,3 +4,5 @@ XCODE_PRODUCT_TYPE Set the Xcode ``productType`` attribute on its reference to a target. CMake computes a default based on target type but can be told explicitly with this property. + +See also :prop_tgt:`XCODE_EXPLICIT_FILE_TYPE`. diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 82ca7a8..736aa91 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -2313,6 +2313,10 @@ const char* cmGlobalXCodeGenerator::GetTargetLinkFlagsVar( const char* cmGlobalXCodeGenerator::GetTargetFileType( cmGeneratorTarget* target) { + if (const char* e = target->GetProperty("XCODE_EXPLICIT_FILE_TYPE")) { + return e; + } + switch (target->GetType()) { case cmStateEnums::OBJECT_LIBRARY: case cmStateEnums::STATIC_LIBRARY: https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7ecac703cec8bde71f8d11c1a8fa34bfa077edee commit 7ecac703cec8bde71f8d11c1a8fa34bfa077edee Author: Gregor Jasny <gja...@googlemail.com> AuthorDate: Sat Dec 3 23:46:15 2016 +0100 Commit: Gregor Jasny <gja...@googlemail.com> CommitDate: Sun Dec 4 00:13:08 2016 +0100 Xcode: Add target property to override productType diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst index e55524c..292a85b 100644 --- a/Help/manual/cmake-properties.7.rst +++ b/Help/manual/cmake-properties.7.rst @@ -294,6 +294,7 @@ Properties on Targets /prop_tgt/WIN32_EXECUTABLE /prop_tgt/WINDOWS_EXPORT_ALL_SYMBOLS /prop_tgt/XCODE_ATTRIBUTE_an-attribute + /prop_tgt/XCODE_PRODUCT_TYPE /prop_tgt/XCTEST .. _`Test Properties`: diff --git a/Help/prop_tgt/XCODE_PRODUCT_TYPE.rst b/Help/prop_tgt/XCODE_PRODUCT_TYPE.rst new file mode 100644 index 0000000..1fbf001 --- /dev/null +++ b/Help/prop_tgt/XCODE_PRODUCT_TYPE.rst @@ -0,0 +1,6 @@ +XCODE_PRODUCT_TYPE +------------------ + +Set the Xcode ``productType`` attribute on its reference to a +target. CMake computes a default based on target type but +can be told explicitly with this property. diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 50197c9..82ca7a8 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -2340,6 +2340,10 @@ const char* cmGlobalXCodeGenerator::GetTargetFileType( const char* cmGlobalXCodeGenerator::GetTargetProductType( cmGeneratorTarget* target) { + if (const char* e = target->GetProperty("XCODE_PRODUCT_TYPE")) { + return e; + } + switch (target->GetType()) { case cmStateEnums::OBJECT_LIBRARY: case cmStateEnums::STATIC_LIBRARY: ----------------------------------------------------------------------- Summary of changes: Help/manual/cmake-properties.7.rst | 2 ++ Help/{prop_sf => prop_tgt}/XCODE_EXPLICIT_FILE_TYPE.rst | 4 ++-- Help/prop_tgt/XCODE_PRODUCT_TYPE.rst | 8 ++++++++ Source/cmGlobalXCodeGenerator.cxx | 8 ++++++++ 4 files changed, 20 insertions(+), 2 deletions(-) copy Help/{prop_sf => prop_tgt}/XCODE_EXPLICIT_FILE_TYPE.rst (58%) create mode 100644 Help/prop_tgt/XCODE_PRODUCT_TYPE.rst hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits