[Cmake-commits] CMake branch, next, updated. v2.8.12-4730-gf24ef61

[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  f24ef61cddba064cf2ed448294b1f78f2c4362b7 (commit)
       via  53d6ebb36079bd30c9033e4374fd8d31a2928b6a (commit)
      from  10e54d095de4c136589a588d10b7b68a79db289a (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=f24ef61cddba064cf2ed448294b1f78f2c4362b7
commit f24ef61cddba064cf2ed448294b1f78f2c4362b7
Merge: 10e54d0 53d6ebb
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Fri Nov 1 07:32:00 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Nov 1 07:32:00 2013 -0400

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=53d6ebb36079bd30c9033e4374fd8d31a2928b6a
commit 53d6ebb36079bd30c9033e4374fd8d31a2928b6a
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Fri Nov 1 05:31:07 2013 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Fri Nov 1 05:31:07 2013 -0600

    cpack: For DragNDrop generator, add sysroot option when calling Rez.

diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake
index cd98f49..2d641f5 100644
--- a/Modules/CPack.cmake
+++ b/Modules/CPack.cmake
@@ -519,9 +519,9 @@ 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
+# set sysroot so SDK tools can be used
 if(CMAKE_OSX_SYSROOT)
-  set(CPACK_OSX_SYSROOT "${CMAKE_OSX_SYSROOT}")
+  cpack_set_if_not_set(CPACK_OSX_SYSROOT "${CMAKE_OSX_SYSROOT}")
 endif()
 
 if(DEFINED CPACK_COMPONENTS_ALL)
diff --git a/Source/CPack/cmCPackDragNDropGenerator.cxx b/Source/CPack/cmCPackDragNDropGenerator.cxx
index ab386d3..dfb2f15 100644
--- a/Source/CPack/cmCPackDragNDropGenerator.cxx
+++ b/Source/CPack/cmCPackDragNDropGenerator.cxx
@@ -505,7 +505,7 @@ int cmCPackDragNDropGenerator::CreateDMG(const std::string& src_dir,
     cmOStringStream embed_sla_command;
     embed_sla_command << this->GetOption("CPACK_COMMAND_REZ");
     const char* sysroot = this->GetOption("CPACK_OSX_SYSROOT");
-    if(sysroot)
+    if(sysroot && sysroot[0] != '\0')
       {
       embed_sla_command << " -isysroot \"" << sysroot << "\"";
       }

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

Summary of changes:
 Modules/CPack.cmake                        |    4 ++--
 Source/CPack/cmCPackDragNDropGenerator.cxx |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake