Browse Source

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.
Rolf Eike Beer 13 years ago
parent
commit
af80da349b
3 changed files with 4 additions and 6 deletions
  1. 2 2
      Modules/FindBLAS.cmake
  2. 0 2
      Modules/FindGTK2.cmake
  3. 2 2
      Modules/FindLAPACK.cmake

+ 2 - 2
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 ()
 

+ 0 - 2
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

+ 2 - 2
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})