[Cmake-commits] CMake branch, next, updated. v3.2.1-1090-g80ca453

[Clinton Stimpson]

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  80ca453b3313688e40750f0908c05a77d5c4a3d4 (commit)
       via  2c50db263a9e23b0240f769c335fb6f2ebc1b72a (commit)
      from  15b62be62df4829a76f8de62785e81934610c77a (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=80ca453b3313688e40750f0908c05a77d5c4a3d4
commit 80ca453b3313688e40750f0908c05a77d5c4a3d4
Merge: 15b62be 2c50db2
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Wed Mar 18 23:05:04 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Mar 18 23:05:04 2015 -0400

    Merge topic 'cpack-bundle-codesign' into next
    
    2c50db26 CPack: Add support to overwrite or pass additional parameter to codesign


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2c50db263a9e23b0240f769c335fb6f2ebc1b72a
commit 2c50db263a9e23b0240f769c335fb6f2ebc1b72a
Author:     André Klitzing <aklitzing at gmail.com>
AuthorDate: Wed Mar 11 13:04:15 2015 +0100
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Wed Mar 18 20:53:30 2015 -0600

    CPack: Add support to overwrite or pass additional parameter to codesign

diff --git a/Modules/CPackBundle.cmake b/Modules/CPackBundle.cmake
index d26a0b3..b412216 100644
--- a/Modules/CPackBundle.cmake
+++ b/Modules/CPackBundle.cmake
@@ -52,6 +52,11 @@
 #  list the main application folder, or the main executable. You should
 #  list any frameworks and plugins that are included in your app bundle.
 #
+# .. variable:: CPACK_BUNDLE_APPLE_CODESIGN_PARAMETER
+#
+#  Additional parameter that will passed to codesign.
+#  Default value: "--deep -f"
+#
 # .. variable:: CPACK_COMMAND_CODESIGN
 #
 #  Path to the codesign(1) command used to sign applications with an
diff --git a/Source/CPack/cmCPackBundleGenerator.cxx b/Source/CPack/cmCPackBundleGenerator.cxx
index 6e7a26b..01c3f8b 100644
--- a/Source/CPack/cmCPackBundleGenerator.cxx
+++ b/Source/CPack/cmCPackBundleGenerator.cxx
@@ -221,6 +221,10 @@ int cmCPackBundleGenerator::SignBundle(const std::string& src_dir)
     bundle_path += ".app";
 
     // A list of additional files to sign, ie. frameworks and plugins.
+    const std::string sign_parameter =
+      this->GetOption("CPACK_BUNDLE_APPLE_CODESIGN_PARAMETER")
+      ? this->GetOption("CPACK_BUNDLE_APPLE_CODESIGN_PARAMETER") : "--deep -f";
+
     const std::string sign_files =
       this->GetOption("CPACK_BUNDLE_APPLE_CODESIGN_FILES")
       ? this->GetOption("CPACK_BUNDLE_APPLE_CODESIGN_FILES") : "";
@@ -234,7 +238,7 @@ int cmCPackBundleGenerator::SignBundle(const std::string& src_dir)
       {
       std::ostringstream temp_sign_file_cmd;
       temp_sign_file_cmd << this->GetOption("CPACK_COMMAND_CODESIGN");
-      temp_sign_file_cmd << " --deep -f -s \"" << cpack_apple_cert_app;
+      temp_sign_file_cmd << " " << sign_parameter << " -s \"" << cpack_apple_cert_app;
       temp_sign_file_cmd << "\" -i ";
       temp_sign_file_cmd << this->GetOption("CPACK_APPLE_BUNDLE_ID");
       temp_sign_file_cmd << " \"";
@@ -254,7 +258,7 @@ int cmCPackBundleGenerator::SignBundle(const std::string& src_dir)
     // sign main binary
     std::ostringstream temp_sign_binary_cmd;
     temp_sign_binary_cmd << this->GetOption("CPACK_COMMAND_CODESIGN");
-    temp_sign_binary_cmd << " --deep -f -s \"" << cpack_apple_cert_app;
+    temp_sign_binary_cmd << " " << sign_parameter << " -s \"" << cpack_apple_cert_app;
     temp_sign_binary_cmd << "\" \"" << bundle_path << "\"";
 
     if(!this->RunCommand(temp_sign_binary_cmd, &output))
@@ -269,7 +273,7 @@ int cmCPackBundleGenerator::SignBundle(const std::string& src_dir)
     // sign app bundle
     std::ostringstream temp_codesign_cmd;
     temp_codesign_cmd << this->GetOption("CPACK_COMMAND_CODESIGN");
-    temp_codesign_cmd << " --deep -f -s \"" << cpack_apple_cert_app << "\"";
+    temp_codesign_cmd << " " << sign_parameter << " -s \"" << cpack_apple_cert_app << "\"";
     if(this->GetOption("CPACK_BUNDLE_APPLE_ENTITLEMENTS"))
       {
       temp_codesign_cmd << " --entitlements ";

-----------------------------------------------------------------------

Summary of changes:
 Modules/CPackBundle.cmake               |    5 +++++
 Source/CPack/cmCPackBundleGenerator.cxx |   10 +++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake