kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Rolf Eike Beer 2012-03-26 16:45:04 +02:00
parent 733726edf6
commit af80da349b
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/FindBLAS.cmake
View File

@ -81,9 +81,9 @@ if (NOT _libdir)
if (WIN32) if (WIN32)
set(_libdir ENV LIB) set(_libdir ENV LIB)
elseif (APPLE) 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 () 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 ()
endif () endif ()

2
Modules/FindGTK2.cmake
View File

@ -305,9 +305,7 @@ function(_GTK2_FIND_LIBRARY _var _lib _expand_vc _append_version)
NAMES ${_lib_list} NAMES ${_lib_list}
PATHS PATHS
/opt/gnome/lib /opt/gnome/lib
/opt/gnome/lib64
/usr/openwin/lib /usr/openwin/lib
/usr/openwin/lib64
/sw/lib /sw/lib
$ENV{GTKMM_BASEPATH}/lib $ENV{GTKMM_BASEPATH}/lib
[HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/lib [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/lib

4
Modules/FindLAPACK.cmake
View File

@ -69,9 +69,9 @@ if (NOT _libdir)
if (WIN32) if (WIN32)
set(_libdir ENV LIB) set(_libdir ENV LIB)
elseif (APPLE) 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 () 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 ()
endif () endif ()
foreach(_library ${_list}) foreach(_library ${_list})