]>
Commit | Line | Data |
---|---|---|
f13d1e41 PS |
1 | --- cmake-2.4.10/Modules/KDE3Macros.cmake.orig 2012-11-03 08:29:52.205394821 +0100 |
2 | +++ cmake-2.4.10/Modules/KDE3Macros.cmake 2012-11-03 08:31:27.108749182 +0100 | |
3 | @@ -336,7 +336,7 @@ | |
9c9fe3d3 AG |
4 | file(APPEND ${_laname} "# Should we warn about portability when linking against -modules?\nshouldnotlink=yes\n") |
5 | file(APPEND ${_laname} "# Files to dlopen/dlpreopen\ndlopen=''\ndlpreopen=''\n") | |
6 | file(APPEND ${_laname} "# Directory that this library needs to be installed in:\n") | |
7 | - file(APPEND ${_laname} "libdir='${CMAKE_INSTALL_PREFIX}/lib/kde3'\n") | |
8 | + file(APPEND ${_laname} "libdir='${CMAKE_INSTALL_PREFIX}/lib64/kde3'\n") | |
b7bf2cc4 | 9 | |
9c9fe3d3 | 10 | install_files(${KDE3_LIBTOOL_DIR} FILES ${_laname}) |
f13d1e41 | 11 | endmacro() |
90b41c6c JR |
12 | --- cmake-3.1.0/Modules/FindZLIB.cmake~ 2014-12-15 20:07:43.000000000 +0000 |
13 | +++ cmake-3.1.0/Modules/FindZLIB.cmake 2014-12-24 21:00:27.139263296 +0000 | |
050e6809 AM |
14 | @@ -109,8 +109,8 @@ if(NOT ZLIB_LIBRARY) |
15 | endif() | |
16 | ||
834c9659 | 17 | foreach(search ${_ZLIB_SEARCHES}) |
59c0184d AG |
18 | - find_library(ZLIB_LIBRARY_RELEASE NAMES ${ZLIB_NAMES} NAMES_PER_DIR ${${search}} PATH_SUFFIXES lib) |
19 | - find_library(ZLIB_LIBRARY_DEBUG NAMES ${ZLIB_NAMES_DEBUG} NAMES_PER_DIR ${${search}} PATH_SUFFIXES lib) | |
20 | + find_library(ZLIB_LIBRARY_RELEASE NAMES ${ZLIB_NAMES} NAMES_PER_DIR ${${search}} PATH_SUFFIXES lib64) | |
21 | + find_library(ZLIB_LIBRARY_DEBUG NAMES ${ZLIB_NAMES_DEBUG} NAMES_PER_DIR ${${search}} PATH_SUFFIXES lib64) | |
834c9659 | 22 | endforeach() |
90b41c6c | 23 | |
050e6809 AM |
24 | # Restore the original find library ordering |
25 |