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 bb9d46a0c05ba8ee02686eb2bb6b54653154efac (commit)
via e36e5a2680f34c64773944b152e5337f8951a644 (commit)
from c4b7479bd0583670302562c9d1841fa13b3c8fea (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=bb9d46a0c05ba8ee02686eb2bb6b54653154efac
commit bb9d46a0c05ba8ee02686eb2bb6b54653154efac
Merge: c4b7479 e36e5a2
Author: Gregor Jasny <gja...@googlemail.com>
AuthorDate: Sat Jun 18 17:23:56 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Sat Jun 18 17:23:56 2016 -0400
Merge topic 'xcode-bundle-extension' into next
e36e5a26 Xcode: Properly handle BUNDLE_EXTENSION
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e36e5a2680f34c64773944b152e5337f8951a644
commit e36e5a2680f34c64773944b152e5337f8951a644
Author: Gregor Jasny <gja...@googlemail.com>
AuthorDate: Sat Jun 18 22:59:40 2016 +0200
Commit: Gregor Jasny <gja...@googlemail.com>
CommitDate: Sat Jun 18 23:23:32 2016 +0200
Xcode: Properly handle BUNDLE_EXTENSION
diff --git a/Source/cmGlobalXCodeGenerator.cxx
b/Source/cmGlobalXCodeGenerator.cxx
index d30830a..e82cb16 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1801,6 +1801,11 @@ void
cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt,
extraLinkOptions += " ";
extraLinkOptions += createFlags;
}
+ const char* ext = gtgt->GetProperty("BUNDLE_EXTENSION");
+ if (ext) {
+ buildSettings->AddAttribute("WRAPPER_EXTENSION",
+ this->CreateString(ext));
+ }
std::string plist = this->ComputeInfoPListLocation(gtgt);
// Xcode will create the final version of Info.plist at build time,
// so let it replace the cfbundle name. This avoids creating
diff --git a/Tests/CFBundleTest/CMakeLists.txt
b/Tests/CFBundleTest/CMakeLists.txt
index 5cda527..0fe6bb7 100644
--- a/Tests/CFBundleTest/CMakeLists.txt
+++ b/Tests/CFBundleTest/CMakeLists.txt
@@ -50,7 +50,6 @@ set_source_files_properties(
set_target_properties(CFBundleTest PROPERTIES
BUNDLE 1
BUNDLE_EXTENSION plugin
- XCODE_ATTRIBUTE_WRAPPER_EXTENSION plugin #sets the extension to .plugin
XCODE_ATTRIBUTE_MACH_O_TYPE mh_bundle
XCODE_ATTRIBUTE_INFOPLIST_FILE ${CMAKE_CURRENT_BINARY_DIR}/Info.plist
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_BINARY_DIR}/Info.plist
-----------------------------------------------------------------------
Summary of changes:
Source/cmGlobalXCodeGenerator.cxx | 5 +++++
Tests/CFBundleTest/CMakeLists.txt | 1 -
2 files changed, 5 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
