[Cmake-commits] CMake branch, next, updated. v2.8.3-1315-gffa69d5

[David Cole]

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  ffa69d506a27cda31a6eb64006939e9771159cf1 (commit)
       via  cabc407912bb3bc0bb954e317a999cb2ee64de57 (commit)
      from  c768b354f38df55c9ea8fe2f2176208a8ff4594f (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=ffa69d506a27cda31a6eb64006939e9771159cf1
commit ffa69d506a27cda31a6eb64006939e9771159cf1
Merge: c768b35 cabc407
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Tue Jan 11 16:52:06 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 11 16:52:06 2011 -0500

    Merge topic 'fix-11295-support-plugin-bundles-on-mac' into next
    
    cabc407 CFBundle Test: Add PATHS for finding Rez (#11295)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cabc407912bb3bc0bb954e317a999cb2ee64de57
commit cabc407912bb3bc0bb954e317a999cb2ee64de57
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Tue Jan 11 16:48:37 2011 -0500
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Tue Jan 11 16:48:37 2011 -0500

    CFBundle Test: Add PATHS for finding Rez (#11295)
    
    Some older dashboard machines do not have Rez in /usr/bin
    like us modern folk. But most of them will have it in
    /Developer/Tools... So make sure we look there.

diff --git a/Tests/CFBundleTest/CMakeLists.txt b/Tests/CFBundleTest/CMakeLists.txt
index 347578b..8fd9efd 100644
--- a/Tests/CFBundleTest/CMakeLists.txt
+++ b/Tests/CFBundleTest/CMakeLists.txt
@@ -25,7 +25,10 @@ configure_file(Info.plist.in ${CMAKE_CURRENT_BINARY_DIR}/Info.plist)
 configure_file(InfoPlist.strings.in ${CMAKE_CURRENT_BINARY_DIR}/InfoPlist.strings)
 
 # Compile the resource file
-find_program(RC_COMPILER Rez NO_DEFAULT_PATHS)
+find_program(RC_COMPILER Rez NO_DEFAULT_PATHS PATHS /Developer/Tools)
+if(NOT RC_COMPILER)
+  message(FATAL_ERROR "could not find Rez to build resources from .r file...")
+endif()
 
 execute_process(COMMAND
     ${RC_COMPILER} ${RCFILES} -useDF -o ${CMAKE_CURRENT_BINARY_DIR}/Localized.rsrc

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

Summary of changes:
 Tests/CFBundleTest/CMakeLists.txt |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake