[Cmake-commits] CMake branch, next, updated. v2.8.12-4726-g11f9626

[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  11f96261dc61b773253f722710c7d5806f53f32a (commit)
       via  193029c4aaad7a13f0b6efed59a1c88af0dc6714 (commit)
      from  b42c8450da7d01895840ac1bbea0b4bfec83e553 (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=11f96261dc61b773253f722710c7d5806f53f32a
commit 11f96261dc61b773253f722710c7d5806f53f32a
Merge: b42c845 193029c
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Thu Oct 31 22:26:10 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 31 22:26:10 2013 -0400

    Merge topic 'cpack-drag-n-drop-rez' into next
    
    193029c cpack: For DragNDrop generator, add sysroot option when calling Rez.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=193029c4aaad7a13f0b6efed59a1c88af0dc6714
commit 193029c4aaad7a13f0b6efed59a1c88af0dc6714
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Thu Oct 31 20:14:58 2013 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Thu Oct 31 20:25:12 2013 -0600

    cpack: For DragNDrop generator, add sysroot option when calling Rez.
    
    Also adding overwrite option (-ov) in case multiple temporary
    dmg files are being created.
    
    Fixes bug #14536.

diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake
index da6b2e0..cd98f49 100644
--- a/Modules/CPack.cmake
+++ b/Modules/CPack.cmake
@@ -519,6 +519,11 @@ cpack_set_if_not_set(CPACK_NSIS_INSTALLER_MUI_ICON_CODE "")
 # WiX specific variables
 cpack_set_if_not_set(CPACK_WIX_SIZEOF_VOID_P "${CMAKE_SIZEOF_VOID_P}")
 
+# osx sysroot
+if(CMAKE_OSX_SYSROOT)
+  set(CPACK_OSX_SYSROOT "${CMAKE_OSX_SYSROOT}")
+endif()
+
 if(DEFINED CPACK_COMPONENTS_ALL)
   if(CPACK_MONOLITHIC_INSTALL)
     message("CPack warning: both CPACK_COMPONENTS_ALL and CPACK_MONOLITHIC_INSTALL have been set.\nDefaulting to a monolithic installation.")
diff --git a/Source/CPack/cmCPackDragNDropGenerator.cxx b/Source/CPack/cmCPackDragNDropGenerator.cxx
index d973c01..ab386d3 100644
--- a/Source/CPack/cmCPackDragNDropGenerator.cxx
+++ b/Source/CPack/cmCPackDragNDropGenerator.cxx
@@ -474,7 +474,7 @@ int cmCPackDragNDropGenerator::CreateDMG(const std::string& src_dir,
     udco_image_command << this->GetOption("CPACK_COMMAND_HDIUTIL");
     udco_image_command << " convert \"" << temp_image << "\"";
     udco_image_command << " -format UDCO";
-    udco_image_command << " -o \"" << temp_udco << "\"";
+    udco_image_command << " -ov -o \"" << temp_udco << "\"";
 
     std::string error;
     if(!this->RunCommand(udco_image_command, &error))
@@ -504,6 +504,11 @@ int cmCPackDragNDropGenerator::CreateDMG(const std::string& src_dir,
     // Rez the SLA
     cmOStringStream embed_sla_command;
     embed_sla_command << this->GetOption("CPACK_COMMAND_REZ");
+    const char* sysroot = this->GetOption("CPACK_OSX_SYSROOT");
+    if(sysroot)
+      {
+      embed_sla_command << " -isysroot \"" << sysroot << "\"";
+      }
     embed_sla_command << " \"" << sla_r << "\"";
     embed_sla_command << " -a -o ";
     embed_sla_command << "\"" << temp_udco << "\"";
diff --git a/Tests/CPackComponentsForAll/CMakeLists.txt b/Tests/CPackComponentsForAll/CMakeLists.txt
index 8162f0c..ff40e30 100644
--- a/Tests/CPackComponentsForAll/CMakeLists.txt
+++ b/Tests/CPackComponentsForAll/CMakeLists.txt
@@ -59,6 +59,7 @@ set(CPACK_PACKAGE_VERSION_MAJOR "1")
 set(CPACK_PACKAGE_VERSION_MINOR "0")
 set(CPACK_PACKAGE_VERSION_PATCH "2")
 set(CPACK_PACKAGE_INSTALL_DIRECTORY "CPack Component Example")
+set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_CURRENT_SOURCE_DIR}/license.txt)
 
 # Tell CPack all of the components to install. The "ALL"
 # refers to the fact that this is the set of components that
@@ -120,4 +121,4 @@ if (NOT ("${CPackComponentWay}" STREQUAL "default"))
   set(CPACK_PROJECT_CONFIG_FILE ${CPackComponentsForAll_BINARY_DIR}/MyLibCPackConfig-${CPackComponentWay}.cmake)
 endif ()
 # Include CPack to introduce the appropriate targets
-include(CPack)
\ No newline at end of file
+include(CPack)
diff --git a/Tests/CPackComponentsForAll/license.txt b/Tests/CPackComponentsForAll/license.txt
new file mode 100644
index 0000000..ba8ba48
--- /dev/null
+++ b/Tests/CPackComponentsForAll/license.txt
@@ -0,0 +1,3 @@
+LICENSE
+-------
+This is an installer created using CPack (http://www.cmake.org). No license provided.

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

Summary of changes:
 Modules/CPack.cmake                                |    5 +++++
 Source/CPack/cmCPackDragNDropGenerator.cxx         |    7 ++++++-
 Tests/CPackComponentsForAll/CMakeLists.txt         |    3 ++-
 .../CPackComponentsForAll/license.txt              |    4 +---
 4 files changed, 14 insertions(+), 5 deletions(-)
 copy Templates/CPack.GenericLicense.txt => Tests/CPackComponentsForAll/license.txt (90%)


hooks/post-receive
-- 
CMake