[Cmake-commits] CMake branch, next, updated. v2.8.2-632-ge42618b

[Brad King]

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  e42618b86d809c459b1f7c7161e143f422a298a5 (commit)
       via  eae45a67e7901b9b5531a4cd49e9716e8edb3956 (commit)
      from  376baacec615e866b7d71036eae12bd87f6c0821 (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=e42618b86d809c459b1f7c7161e143f422a298a5
commit e42618b86d809c459b1f7c7161e143f422a298a5
Merge: 376baac eae45a6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 1 08:58:28 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 1 08:58:28 2010 -0400

    Merge topic 'find-macports' into next
    
    eae45a6 Search MacPorts /opt/local prefix on Mac


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eae45a67e7901b9b5531a4cd49e9716e8edb3956
commit eae45a67e7901b9b5531a4cd49e9716e8edb3956
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 31 14:16:59 2010 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 1 08:50:51 2010 -0400

    Search MacPorts /opt/local prefix on Mac
    
    Include this prefix in CMAKE_SYSTEM_PREFIX_PATH so that it will be used
    for all find* commands.  Previously only find_library and find_path
    would look under /opt/local/lib and /opt/local/include, respectively.

diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
index c8bcad1..db0642e 100644
--- a/Modules/Platform/Darwin.cmake
+++ b/Modules/Platform/Darwin.cmake
@@ -235,4 +235,7 @@ SET(CMAKE_SYSTEM_APPBUNDLE_PATH
   /Developer/Applications)
 
 INCLUDE(Platform/UnixPaths)
-LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH /sw)
+LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH
+  /sw        # Fink
+  /opt/local # MacPorts
+  )
diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake
index ae3c187..5ee7ddb 100644
--- a/Modules/Platform/UnixPaths.cmake
+++ b/Modules/Platform/UnixPaths.cmake
@@ -51,7 +51,7 @@ LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH
   /usr/X11R6/include /usr/include/X11
 
   # Other
-  /opt/local/include /usr/pkg/include
+  /usr/pkg/include
   /opt/csw/include /opt/include  
   /usr/openwin/include
   )
@@ -64,7 +64,7 @@ LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH
   /usr/X11R6/lib /usr/lib/X11
 
   # Other
-  /opt/local/lib /usr/pkg/lib
+  /usr/pkg/lib
   /opt/csw/lib /opt/lib 
   /usr/openwin/lib
   )

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

Summary of changes:
 Modules/Platform/Darwin.cmake    |    5 ++++-
 Modules/Platform/UnixPaths.cmake |    4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake