[Cmake-commits] CMake branch, next, updated. v2.8.7-3415-g704356f

[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  704356fffa22d50c986aaaa9cec6219a33ad5554 (commit)
       via  6190415436bd00de65cd702e5e5e74061d0c8462 (commit)
       via  d9edf46760a39d230836a7b99fb4ac33d466c337 (commit)
      from  62bd23f62b63af432ce7c97db6d2c4f75a56c68f (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=704356fffa22d50c986aaaa9cec6219a33ad5554
commit 704356fffa22d50c986aaaa9cec6219a33ad5554
Merge: 62bd23f 6190415
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Apr 6 11:22:34 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 6 11:22:34 2012 -0400

    Merge topic 'osx-search-paths' into next
    
    6190415 OS X: Mark find_program results as advanced
    d9edf46 OS X: Use correct extra path when searching for applicaton bundles (#13066)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6190415436bd00de65cd702e5e5e74061d0c8462
commit 6190415436bd00de65cd702e5e5e74061d0c8462
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Apr 6 11:15:39 2012 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Fri Apr 6 11:15:39 2012 -0400

    OS X: Mark find_program results as advanced
    
    Avoid cluttering the gui with variables nearly nobody needs
    to see.

diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
index ee1fc0e..f9d37c3 100644
--- a/Modules/Platform/Darwin.cmake
+++ b/Modules/Platform/Darwin.cmake
@@ -56,6 +56,7 @@ SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a")
 # hardcode CMAKE_INSTALL_NAME_TOOL here to install_name_tool, so it behaves as it did before, Alex
 IF(NOT DEFINED CMAKE_INSTALL_NAME_TOOL)
   FIND_PROGRAM(CMAKE_INSTALL_NAME_TOOL install_name_tool)
+  MARK_AS_ADVANCED(CMAKE_INSTALL_NAME_TOOL)
 ENDIF(NOT DEFINED CMAKE_INSTALL_NAME_TOOL)
 
 # Set the assumed (Pre 10.5 or Default) location of the developer tools
@@ -63,6 +64,7 @@ SET(OSX_DEVELOPER_ROOT "/Developer")
 
 # Use the xcode-select tool if it's available (Xcode >= 3.0 installations)
 FIND_PROGRAM(CMAKE_XCODE_SELECT xcode-select)
+MARK_AS_ADVANCED(CMAKE_XCODE_SELECT)
 IF(CMAKE_XCODE_SELECT)
   EXECUTE_PROCESS(COMMAND ${CMAKE_XCODE_SELECT} "-print-path"
     OUTPUT_VARIABLE OSX_DEVELOPER_ROOT

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d9edf46760a39d230836a7b99fb4ac33d466c337
commit d9edf46760a39d230836a7b99fb4ac33d466c337
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Apr 6 10:47:02 2012 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Fri Apr 6 11:14:37 2012 -0400

    OS X: Use correct extra path when searching for applicaton bundles (#13066)
    
    The parent commit added a search path relative to OSX_DEVELOPER_ROOT.
    But with Xcode 4.3 the nested Applications folder is in a different
    relative location compared to that root. This commit makes the intent
    of the previous commit work with older and newer Xcode directory layouts.
    
    Furthermore, it only adds paths that exist to the search path.

diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
index b8357d1..ee1fc0e 100644
--- a/Modules/Platform/Darwin.cmake
+++ b/Modules/Platform/Darwin.cmake
@@ -239,10 +239,22 @@ SET(CMAKE_SYSTEM_FRAMEWORK_PATH
 # default to searching for application bundles first
 SET(CMAKE_FIND_APPBUNDLE FIRST)
 # set up the default search directories for application bundles
+SET(_apps_paths)
+FOREACH(_path
+  "~/Applications"
+  "/Applications"
+  "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+
+  "${OSX_DEVELOPER_ROOT}/Applications"    # pre-4.3
+  )
+  GET_FILENAME_COMPONENT(_apps "${_path}" ABSOLUTE)
+  IF(EXISTS "${_apps}")
+    LIST(APPEND _apps_paths "${_apps}")
+  ENDIF()
+ENDFOREACH()
+LIST(REMOVE_DUPLICATES _apps_paths)
 SET(CMAKE_SYSTEM_APPBUNDLE_PATH
-  ~/Applications
-  /Applications
-  ${OSX_DEVELOPER_ROOT}/Applications)
+  ${_apps_paths})
+UNSET(_apps_paths)
 
 INCLUDE(Platform/UnixPaths)
 LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH

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

Summary of changes:
 Modules/Platform/Darwin.cmake |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake