- updated libx32 patch (most changes upstream now)
[packages/cmake.git] / cmake-libx32.patch
1 --- cmake-3.1.3/Modules/FindZLIB.cmake  2015-02-11 16:17:39.000000000 +0000
2 +++ cmake-3.1.3.x32/Modules/FindZLIB.cmake      2015-03-05 21:07:55.935140350 +0000
3 @@ -85,8 +85,8 @@
4  # Allow ZLIB_LIBRARY to be set manually, as the location of the zlib library
5  if(NOT ZLIB_LIBRARY)
6    foreach(search ${_ZLIB_SEARCHES})
7 -    find_library(ZLIB_LIBRARY_RELEASE NAMES ${ZLIB_NAMES} ${${search}} PATH_SUFFIXES lib)
8 -    find_library(ZLIB_LIBRARY_DEBUG NAMES ${ZLIB_NAMES_DEBUG} ${${search}} PATH_SUFFIXES lib)
9 +    find_library(ZLIB_LIBRARY_RELEASE NAMES ${ZLIB_NAMES} ${${search}} PATH_SUFFIXES libx32)
10 +    find_library(ZLIB_LIBRARY_DEBUG NAMES ${ZLIB_NAMES_DEBUG} ${${search}} PATH_SUFFIXES libx32)
11    endforeach()
12  
13    include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
14 --- cmake-3.1.3/Modules/KDE3Macros.cmake        2015-02-11 16:17:39.000000000 +0000
15 +++ cmake-3.1.3.x32/Modules/KDE3Macros.cmake    2015-03-05 21:07:55.935140350 +0000
16 @@ -336,7 +336,7 @@
17     file(APPEND ${_laname} "# Should we warn about portability when linking against -modules?\nshouldnotlink=yes\n")
18     file(APPEND ${_laname} "# Files to dlopen/dlpreopen\ndlopen=''\ndlpreopen=''\n")
19     file(APPEND ${_laname} "# Directory that this library needs to be installed in:\n")
20 -   file(APPEND ${_laname} "libdir='${CMAKE_INSTALL_PREFIX}/lib/kde3'\n")
21 +   file(APPEND ${_laname} "libdir='${CMAKE_INSTALL_PREFIX}/libx32/kde3'\n")
22  
23     install_files(${KDE3_LIBTOOL_DIR} FILES ${_laname})
24  endmacro()
25 --- cmake-3.9.6/Modules/FindGLEW.cmake.orig     2017-11-19 08:53:15.190680707 +0100
26 +++ cmake-3.9.6/Modules/FindGLEW.cmake  2017-11-19 08:58:44.667490585 +0100
27 @@ -27,8 +27,8 @@
28  find_path(GLEW_INCLUDE_DIR GL/glew.h)
29  
30  if(NOT GLEW_LIBRARY)
31 -  find_library(GLEW_LIBRARY_RELEASE NAMES GLEW glew32 glew glew32s PATH_SUFFIXES lib64 libx32)
32 -  find_library(GLEW_LIBRARY_DEBUG NAMES GLEWd glew32d glewd PATH_SUFFIXES lib64)
33 +  find_library(GLEW_LIBRARY_RELEASE NAMES GLEW glew32 glew glew32s PATH_SUFFIXES libx32 lib64)
34 +  find_library(GLEW_LIBRARY_DEBUG NAMES GLEWd glew32d glewd PATH_SUFFIXES libx32 lib64)
35  
36    include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
37    select_library_configurations(GLEW)
38 --- cmake-3.9.6/Modules/Platform/UnixPaths.cmake        2015-02-11 16:17:39.000000000 +0000
39 +++ cmake-3.9.6.x32/Modules/Platform/UnixPaths.cmake    2015-03-05 21:14:33.208470807 +0000
40 @@ -83,7 +83,7 @@
41    )
42  
43  list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
44 -  /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64
45 +  /lib /lib32 /lib64 /libx32 /usr/lib /usr/lib32 /usr/lib64 /usr/libx32
46    )
47  
48  list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
This page took 0.052514 seconds and 3 git commands to generate.