[Cmake-commits] CMake branch, next, updated. v2.8.12-4959-g5880949

[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  58809493676d6c2b4c5e490b1582125a472dd364 (commit)
       via  a5aadcd46d3cd8cbf5bc4855a721a48d9269ab6e (commit)
       via  4d6b88d44b35896ec6a2adecc19b5d73c95539c6 (commit)
      from  c4dfbf4387f33d95b2d5c466e1e979552e2eb2c4 (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=58809493676d6c2b4c5e490b1582125a472dd364
commit 58809493676d6c2b4c5e490b1582125a472dd364
Merge: c4dfbf4 a5aadcd
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Wed Nov 6 08:45:11 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 6 08:45:11 2013 -0500

    Merge topic 'cfbundle-test-no-cl-tools' into next
    
    a5aadcd CFBundle test: Add isysroot argument when calling Rez.
    4d6b88d CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a5aadcd46d3cd8cbf5bc4855a721a48d9269ab6e
commit a5aadcd46d3cd8cbf5bc4855a721a48d9269ab6e
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Wed Nov 6 06:41:54 2013 -0700
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Wed Nov 6 06:42:44 2013 -0700

    CFBundle test: Add isysroot argument when calling Rez.

diff --git a/Tests/CFBundleTest/CMakeLists.txt b/Tests/CFBundleTest/CMakeLists.txt
index bf9771c..5cda527 100644
--- a/Tests/CFBundleTest/CMakeLists.txt
+++ b/Tests/CFBundleTest/CMakeLists.txt
@@ -30,8 +30,14 @@ if(NOT RC_COMPILER)
   message(FATAL_ERROR "could not find Rez to build resources from .r file...")
 endif()
 
+set(sysroot)
+if(CMAKE_OSX_SYSROOT)
+  set(sysroot -isysroot ${CMAKE_OSX_SYSROOT})
+endif()
+
 execute_process(COMMAND
-    ${RC_COMPILER} ${RCFILES} -useDF -o ${CMAKE_CURRENT_BINARY_DIR}/Localized.rsrc
+    ${RC_COMPILER} ${sysroot} ${RCFILES} -useDF
+    -o ${CMAKE_CURRENT_BINARY_DIR}/Localized.rsrc
     )
 
 set_source_files_properties(

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

Summary of changes:
 Source/CMakeVersion.cmake         |    2 +-
 Tests/CFBundleTest/CMakeLists.txt |    8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake