]>
Commit | Line | Data |
---|---|---|
cd7752ab JR |
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 | |
834c9659 JR |
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}) | |
a252fdcc JR |
7 | - find_library(ZLIB_LIBRARY_RELEASE NAMES ${ZLIB_NAMES} NAMES_PER_DIR ${${search}} PATH_SUFFIXES lib) |
8 | - find_library(ZLIB_LIBRARY_DEBUG NAMES ${ZLIB_NAMES_DEBUG} NAMES_PER_DIR ${${search}} PATH_SUFFIXES lib) | |
9 | + find_library(ZLIB_LIBRARY_RELEASE NAMES ${ZLIB_NAMES} NAMES_PER_DIR ${${search}} PATH_SUFFIXES libx32) | |
10 | + find_library(ZLIB_LIBRARY_DEBUG NAMES ${ZLIB_NAMES_DEBUG} NAMES_PER_DIR ${${search}} PATH_SUFFIXES libx32) | |
834c9659 | 11 | endforeach() |
90b41c6c | 12 | |
834c9659 | 13 | include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake) |
cd7752ab JR |
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 @@ | |
59357d4d AG |
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") | |
cd7752ab JR |
22 | |
23 | install_files(${KDE3_LIBTOOL_DIR} FILES ${_laname}) | |
24 | endmacro() | |
bdbf72c3 JB |
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 | |
59357d4d AG |
27 | @@ -139,12 +139,12 @@ |
28 | ||
29 | find_library(GLEW_SHARED_LIBRARY_RELEASE | |
30 | NAMES GLEW glew glew32 | |
31 | - PATH_SUFFIXES lib lib64 libx32 lib/Release/${_arch} | |
32 | + PATH_SUFFIXES libx32 lib64 lib lib/Release/${_arch} | |
33 | PATHS ENV GLEW_ROOT) | |
34 | ||
35 | find_library(GLEW_SHARED_LIBRARY_DEBUG | |
36 | NAMES GLEWd glewd glew32d | |
37 | - PATH_SUFFIXES lib lib64 | |
38 | + PATH_SUFFIXES libx32 lib64 lib | |
39 | PATHS ENV GLEW_ROOT) | |
24512f70 | 40 | |
581dc576 | 41 | |
bdbf72c3 JB |
42 | --- cmake-3.9.6/Modules/Platform/UnixPaths.cmake 2015-02-11 16:17:39.000000000 +0000 |
43 | +++ cmake-3.9.6.x32/Modules/Platform/UnixPaths.cmake 2015-03-05 21:14:33.208470807 +0000 | |
cd7752ab JR |
44 | @@ -83,7 +83,7 @@ |
45 | ) | |
46 | ||
47 | list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES | |
48 | - /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64 | |
bdbf72c3 | 49 | + /lib /lib32 /lib64 /libx32 /usr/lib /usr/lib32 /usr/lib64 /usr/libx32 |
cd7752ab JR |
50 | ) |
51 | ||
52 | list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES |