- release 2 (rebuild with jsoncpp 1.8.4)
[packages/cmake.git] / cmake-lib64.patch
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 @@
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")
9  
10     install_files(${KDE3_LIBTOOL_DIR} FILES ${_laname})
11  endmacro()
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
14 @@ -85,8 +85,8 @@
15  # Allow ZLIB_LIBRARY to be set manually, as the location of the zlib library
16  if(NOT ZLIB_LIBRARY)
17    foreach(search ${_ZLIB_SEARCHES})
18 -    find_library(ZLIB_LIBRARY_RELEASE NAMES ${ZLIB_NAMES} ${${search}} PATH_SUFFIXES lib)
19 -    find_library(ZLIB_LIBRARY_DEBUG NAMES ${ZLIB_NAMES_DEBUG} ${${search}} PATH_SUFFIXES lib)
20 +    find_library(ZLIB_LIBRARY_RELEASE NAMES ${ZLIB_NAMES} ${${search}} PATH_SUFFIXES lib64)
21 +    find_library(ZLIB_LIBRARY_DEBUG NAMES ${ZLIB_NAMES_DEBUG} ${${search}} PATH_SUFFIXES lib64)
22    endforeach()
23  
24    include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
This page took 0.033107 seconds and 3 git commands to generate.