up to 3.27.6

[packages/cmake.git] / cmake-lib64.patch

diff --git a/cmake-lib64.patch b/cmake-lib64.patch
index 6bbea72633cb62d01a327c70b562e548e200e52e..95ec231a2770dbe84a92fd5f1cb075bc74c63f95 100644 (file)
--- a/cmake-lib64.patch
+++ b/cmake-lib64.patch
@@ -1,14 +1,25 @@
---- cmake-2.4.7/Modules/KDE3Macros.cmake       2007-07-17 00:12:30.000000000 +0300
-+++ cmake/Modules/KDE3Macros.cmake     2007-12-06 12:18:50.772890020 +0200
-@@ -319,9 +319,9 @@
-    FILE(APPEND ${_laname} "# Should we warn about portability when linking against -modules?\nshouldnotlink=yes\n")
-    FILE(APPEND ${_laname} "# Files to dlopen/dlpreopen\ndlopen=''\ndlpreopen=''\n")
-    FILE(APPEND ${_laname} "# Directory that this library needs to be installed in:\n")
--   FILE(APPEND ${_laname} "libdir='${CMAKE_INSTALL_PREFIX}/lib/kde3'\n")
-+   FILE(APPEND ${_laname} "libdir='${CMAKE_INSTALL_PREFIX}/lib64/kde3'\n")
+--- cmake-2.4.10/Modules/KDE3Macros.cmake.orig 2012-11-03 08:29:52.205394821 +0100
++++ cmake-2.4.10/Modules/KDE3Macros.cmake      2012-11-03 08:31:27.108749182 +0100
+@@ -336,7 +336,7 @@
+   file(APPEND ${_laname} "# Should we warn about portability when linking against -modules?\nshouldnotlink=yes\n")
+   file(APPEND ${_laname} "# Files to dlopen/dlpreopen\ndlopen=''\ndlpreopen=''\n")
+   file(APPEND ${_laname} "# Directory that this library needs to be installed in:\n")
+-  file(APPEND ${_laname} "libdir='${CMAKE_INSTALL_PREFIX}/lib/kde3'\n")
++  file(APPEND ${_laname} "libdir='${CMAKE_INSTALL_PREFIX}/lib64/kde3'\n")
  
--   INSTALL_FILES(/lib/kde3 FILES ${_laname})
-+   INSTALL_FILES(/lib64/kde3 FILES ${_laname})
- ENDMACRO(KDE3_INSTALL_LIBTOOL_FILE)
+   install_files(${KDE3_LIBTOOL_DIR} FILES ${_laname})
+ endmacro()
+--- cmake-3.1.0/Modules/FindZLIB.cmake~        2014-12-15 20:07:43.000000000 +0000
++++ cmake-3.1.0/Modules/FindZLIB.cmake 2014-12-24 21:00:27.139263296 +0000
+@@ -109,8 +109,8 @@ if(NOT ZLIB_LIBRARY)
+   endif()
  
+   foreach(search ${_ZLIB_SEARCHES})
+-    find_library(ZLIB_LIBRARY_RELEASE NAMES ${ZLIB_NAMES} NAMES_PER_DIR ${${search}} PATH_SUFFIXES lib)
+-    find_library(ZLIB_LIBRARY_DEBUG NAMES ${ZLIB_NAMES_DEBUG} NAMES_PER_DIR ${${search}} PATH_SUFFIXES lib)
++    find_library(ZLIB_LIBRARY_RELEASE NAMES ${ZLIB_NAMES} NAMES_PER_DIR ${${search}} PATH_SUFFIXES lib64)
++    find_library(ZLIB_LIBRARY_DEBUG NAMES ${ZLIB_NAMES_DEBUG} NAMES_PER_DIR ${${search}} PATH_SUFFIXES lib64)
+   endforeach()
  
+   # Restore the original find library ordering
+