[Cmake-commits] CMake branch, next, updated. v2.8.7-3346-g4b37c3c

Brad King brad.king at kitware.com
Mon Mar 26 09:45:11 EDT 2012


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  4b37c3cb6fe6282e82b8d5bd52e51254153be2f7 (commit)
       via  98b9a7f6ffa733a6fdcf06ede839932b770dc7c6 (commit)
      from  489b0e22c9af690d7fb1cf53f8ffa495002d8e48 (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=4b37c3cb6fe6282e82b8d5bd52e51254153be2f7
commit 4b37c3cb6fe6282e82b8d5bd52e51254153be2f7
Merge: 489b0e2 98b9a7f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 26 09:45:05 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 26 09:45:05 2012 -0400

    Merge topic 'osx-search-paths' into next
    
    98b9a7f OS X: Use OSX_DEVELOPER_ROOT for app search path (#13066)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=98b9a7f6ffa733a6fdcf06ede839932b770dc7c6
commit 98b9a7f6ffa733a6fdcf06ede839932b770dc7c6
Author:     Kashif Rasul <kashif at nomad-labs.com>
AuthorDate: Mon Mar 26 09:24:04 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Mar 26 09:28:56 2012 -0400

    OS X: Use OSX_DEVELOPER_ROOT for app search path (#13066)
    
    Since commit 4693cf84 (Xcode: Detect new default locations of Xcode 4.3
    bits and pieces) Darwin.cmake detects the developer application
    directory instead of hard-coding /Developer.  Replace the hard-coded
    path in CMAKE_SYSTEM_APPBUNDLE_PATH using the computed result.

diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
index c4b5635..b8357d1 100644
--- a/Modules/Platform/Darwin.cmake
+++ b/Modules/Platform/Darwin.cmake
@@ -242,7 +242,7 @@ SET(CMAKE_FIND_APPBUNDLE FIRST)
 SET(CMAKE_SYSTEM_APPBUNDLE_PATH
   ~/Applications
   /Applications
-  /Developer/Applications)
+  ${OSX_DEVELOPER_ROOT}/Applications)
 
 INCLUDE(Platform/UnixPaths)
 LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list