[Cmake-commits] CMake branch, next, updated. v3.2.1-1096-g820fa8a

[Brad King]

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  820fa8a738a1d988d3cbe4aec834643448072be3 (commit)
       via  a0075b2789d08a766732dcf287b0b7a0e7c4a8a7 (commit)
      from  8c1e8b7cf477e0f11e374b435ff8e2e3374f0759 (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=820fa8a738a1d988d3cbe4aec834643448072be3
commit 820fa8a738a1d988d3cbe4aec834643448072be3
Merge: 8c1e8b7 a0075b2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 20 09:33:00 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Mar 20 09:33:00 2015 -0400

    Merge topic 'cpack-bundle-codesign' into next
    
    a0075b27 fixup! CPack: Add support to overwrite or pass additional parameter


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a0075b2789d08a766732dcf287b0b7a0e7c4a8a7
commit a0075b2789d08a766732dcf287b0b7a0e7c4a8a7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 20 09:32:16 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Mar 20 09:32:42 2015 -0400

    fixup! CPack: Add support to overwrite or pass additional parameter
    
    Wrap long lines.

diff --git a/Source/CPack/cmCPackBundleGenerator.cxx b/Source/CPack/cmCPackBundleGenerator.cxx
index 01c3f8b..b2d7019 100644
--- a/Source/CPack/cmCPackBundleGenerator.cxx
+++ b/Source/CPack/cmCPackBundleGenerator.cxx
@@ -223,7 +223,8 @@ int cmCPackBundleGenerator::SignBundle(const std::string& src_dir)
     // 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";
+      ? this->GetOption("CPACK_BUNDLE_APPLE_CODESIGN_PARAMETER")
+      : "--deep -f";
 
     const std::string sign_files =
       this->GetOption("CPACK_BUNDLE_APPLE_CODESIGN_FILES")
@@ -238,7 +239,8 @@ 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 << " " << sign_parameter << " -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 << " \"";
@@ -258,7 +260,8 @@ 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 << " " << sign_parameter << " -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))
@@ -273,7 +276,8 @@ 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 << " " << sign_parameter << " -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:
 Source/CPack/cmCPackBundleGenerator.cxx |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake