[Cmake-commits] CMake branch, next, updated. v2.8.8-3547-g6fbf0a7

[Rolf Eike Beer]

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  6fbf0a7aad1fffaa02948e9a53d95d584d0ad909 (commit)
       via  af80da349bb259ccccac146cdd734afeedeec116 (commit)
      from  5a8c7aa1ebfc6a4df0bb269d68eed1bcb337e6b5 (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=6fbf0a7aad1fffaa02948e9a53d95d584d0ad909
commit 6fbf0a7aad1fffaa02948e9a53d95d584d0ad909
Merge: 5a8c7aa af80da3
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat Jul 21 04:27:08 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Jul 21 04:27:08 2012 -0400

    Merge topic 'mixed-lib-to-lib64' into next
    
    af80da3 remove lib64 Unix paths if the respective lib path is also given


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=af80da349bb259ccccac146cdd734afeedeec116
commit af80da349bb259ccccac146cdd734afeedeec116
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Mar 26 16:45:04 2012 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sat Jul 21 10:15:52 2012 +0200

    remove lib64 Unix paths if the respective lib path is also given
    
    If FIND_LIBRARY_USE_LIB64_PATHS is set both will be searched anyway.

diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake
index 9eadfd1..5811a9d 100644
--- a/Modules/FindBLAS.cmake
+++ b/Modules/FindBLAS.cmake
@@ -81,9 +81,9 @@ if (NOT _libdir)
   if (WIN32)
     set(_libdir ENV LIB)
   elseif (APPLE)
-    set(_libdir /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV DYLD_LIBRARY_PATH)
+    set(_libdir ENV DYLD_LIBRARY_PATH)
   else ()
-    set(_libdir /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH)
+    set(_libdir ENV LD_LIBRARY_PATH)
   endif ()
 endif ()
 
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index a03c023..5fe5213 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -305,9 +305,7 @@ function(_GTK2_FIND_LIBRARY _var _lib _expand_vc _append_version)
         NAMES ${_lib_list}
         PATHS
             /opt/gnome/lib
-            /opt/gnome/lib64
             /usr/openwin/lib
-            /usr/openwin/lib64
             /sw/lib
             $ENV{GTKMM_BASEPATH}/lib
             [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/lib
diff --git a/Modules/FindLAPACK.cmake b/Modules/FindLAPACK.cmake
index 0ae98df..b867f21 100644
--- a/Modules/FindLAPACK.cmake
+++ b/Modules/FindLAPACK.cmake
@@ -69,9 +69,9 @@ if (NOT _libdir)
   if (WIN32)
     set(_libdir ENV LIB)
   elseif (APPLE)
-    set(_libdir /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV DYLD_LIBRARY_PATH)
+    set(_libdir ENV DYLD_LIBRARY_PATH)
   else ()
-    set(_libdir /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH)
+    set(_libdir ENV LD_LIBRARY_PATH)
   endif ()
 endif ()
 foreach(_library ${_list})

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

Summary of changes:
 Modules/FindBLAS.cmake   |    4 ++--
 Modules/FindGTK2.cmake   |    2 --
 Modules/FindLAPACK.cmake |    4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake