]>
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 | 3 | @@ -85,8 +85,8 @@ |
13192fae JR |
4 | endif() |
5 | ||
834c9659 | 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 | |
13192fae | 13 | # Restore the original find library ordering |
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 | 22 | |
9d5e52e2 | 23 | install_files(${KDE3_LIBTOOL_DIR} FILES ${_laname}) |
cd7752ab | 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 | |
9d5e52e2 | 27 | @@ -144,13 +144,13 @@ |
59357d4d AG |
28 | find_library(GLEW_SHARED_LIBRARY_RELEASE |
29 | NAMES GLEW glew glew32 | |
9d5e52e2 | 30 | NAMES_PER_DIR |
59357d4d AG |
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 | |
9d5e52e2 | 37 | NAMES_PER_DIR |
59357d4d AG |
38 | - PATH_SUFFIXES lib lib64 |
39 | + PATH_SUFFIXES libx32 lib64 lib | |
40 | PATHS ENV GLEW_ROOT) | |
24512f70 | 41 | |
581dc576 | 42 | |
9d5e52e2 JR |
43 | @@ -159,13 +159,13 @@ |
44 | find_library(GLEW_STATIC_LIBRARY_RELEASE | |
45 | NAMES GLEW glew glew32s | |
46 | NAMES_PER_DIR | |
47 | - PATH_SUFFIXES lib lib64 libx32 lib/Release/${_arch} | |
48 | + PATH_SUFFIXES libx32 lib64 lib lib/Release/${_arch} | |
49 | PATHS ENV GLEW_ROOT) | |
50 | ||
51 | find_library(GLEW_STATIC_LIBRARY_DEBUG | |
52 | NAMES GLEWds glewds glew32ds | |
53 | NAMES_PER_DIR | |
54 | - PATH_SUFFIXES lib lib64 | |
55 | + PATH_SUFFIXES libx32 lib64 lib | |
56 | PATHS ENV GLEW_ROOT) | |
57 | ||
58 | set(CMAKE_FIND_LIBRARY_SUFFIXES ${__GLEW_CURRENT_FIND_LIBRARY_SUFFIXES}) | |
bdbf72c3 JB |
59 | --- cmake-3.9.6/Modules/Platform/UnixPaths.cmake 2015-02-11 16:17:39.000000000 +0000 |
60 | +++ cmake-3.9.6.x32/Modules/Platform/UnixPaths.cmake 2015-03-05 21:14:33.208470807 +0000 | |
cd7752ab JR |
61 | @@ -83,7 +83,7 @@ |
62 | ) | |
63 | ||
64 | list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES | |
65 | - /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64 | |
bdbf72c3 | 66 | + /lib /lib32 /lib64 /libx32 /usr/lib /usr/lib32 /usr/lib64 /usr/libx32 |
cd7752ab JR |
67 | ) |
68 | ||
9d5e52e2 | 69 | if(CMAKE_SYSROOT_COMPILE) |