1 diff -urN cmake-3.1.3/Modules/FindKDE3.cmake cmake-3.1.3.x32/Modules/FindKDE3.cmake
2 --- cmake-3.1.3/Modules/FindKDE3.cmake 2015-02-11 16:17:39.000000000 +0000
3 +++ cmake-3.1.3.x32/Modules/FindKDE3.cmake 2015-03-05 21:21:57.558467591 +0000
5 if(NOT KDE3_LIBTOOL_DIR)
6 if(KDE3_KDECORE_LIBRARY MATCHES lib64)
7 set(KDE3_LIBTOOL_DIR /lib64/kde3)
8 + elseif(KDE3_KDECORE_LIBRARY MATCHES libx32)
9 + set(KDE3_LIBTOOL_DIR /libx32/kde3)
11 set(KDE3_LIBTOOL_DIR /lib/kde3)
13 diff -urN cmake-3.1.3/Modules/FindOpenAL.cmake cmake-3.1.3.x32/Modules/FindOpenAL.cmake
14 --- cmake-3.1.3/Modules/FindOpenAL.cmake 2015-02-11 16:17:39.000000000 +0000
15 +++ cmake-3.1.3.x32/Modules/FindOpenAL.cmake 2015-03-05 21:20:17.398468317 +0000
17 NAMES OpenAL al openal OpenAL32
20 - PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64
21 + PATH_SUFFIXES libx32 lib64 lib libs64 libs libs/Win32 libs/Win64
25 diff -urN cmake-3.1.3/Modules/FindPkgConfig.cmake cmake-3.1.3.x32/Modules/FindPkgConfig.cmake
26 --- cmake-3.1.3/Modules/FindPkgConfig.cmake 2015-02-11 16:17:39.000000000 +0000
27 +++ cmake-3.1.3.x32/Modules/FindPkgConfig.cmake 2015-03-05 21:07:55.938473684 +0000
29 list(APPEND _lib_dirs "lib64/pkgconfig")
32 + get_property(uselibx32 GLOBAL PROPERTY FIND_LIBRARY_USE_LIBX32_PATHS)
34 + list(APPEND _lib_dirs "libx32/pkgconfig")
37 list(APPEND _lib_dirs "lib/pkgconfig")
39 diff -urN cmake-3.1.3/Modules/FindZLIB.cmake cmake-3.1.3.x32/Modules/FindZLIB.cmake
40 --- cmake-3.1.3/Modules/FindZLIB.cmake 2015-02-11 16:17:39.000000000 +0000
41 +++ cmake-3.1.3.x32/Modules/FindZLIB.cmake 2015-03-05 21:07:55.935140350 +0000
43 # Try each search configuration.
44 foreach(search ${_ZLIB_SEARCHES})
45 find_path(ZLIB_INCLUDE_DIR NAMES zlib.h ${${search}} PATH_SUFFIXES include)
46 - find_library(ZLIB_LIBRARY NAMES ${ZLIB_NAMES} ${${search}} PATH_SUFFIXES lib)
47 + find_library(ZLIB_LIBRARY NAMES ${ZLIB_NAMES} ${${search}} PATH_SUFFIXES libx32)
50 mark_as_advanced(ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
51 diff -urN cmake-3.1.3/Modules/GetPrerequisites.cmake cmake-3.1.3.x32/Modules/GetPrerequisites.cmake
52 --- cmake-3.1.3/Modules/GetPrerequisites.cmake 2015-02-11 16:17:39.000000000 +0000
53 +++ cmake-3.1.3.x32/Modules/GetPrerequisites.cmake 2015-03-05 21:18:03.455135952 +0000
55 string(TOLOWER "${resolved_file}" lower)
58 - if(resolved_file MATCHES "^(/lib/|/lib32/|/lib64/|/usr/lib/|/usr/lib32/|/usr/lib64/|/usr/X11R6/|/usr/bin/)")
59 + if(resolved_file MATCHES "^(/lib/|/libx32/|/lib64/|/usr/lib/|/usr/libx32/|/usr/lib64/|/usr/X11R6/|/usr/bin/)")
63 diff -urN cmake-3.1.3/Modules/KDE3Macros.cmake cmake-3.1.3.x32/Modules/KDE3Macros.cmake
64 --- cmake-3.1.3/Modules/KDE3Macros.cmake 2015-02-11 16:17:39.000000000 +0000
65 +++ cmake-3.1.3.x32/Modules/KDE3Macros.cmake 2015-03-05 21:07:55.935140350 +0000
67 file(APPEND ${_laname} "# Should we warn about portability when linking against -modules?\nshouldnotlink=yes\n")
68 file(APPEND ${_laname} "# Files to dlopen/dlpreopen\ndlopen=''\ndlpreopen=''\n")
69 file(APPEND ${_laname} "# Directory that this library needs to be installed in:\n")
70 - file(APPEND ${_laname} "libdir='${CMAKE_INSTALL_PREFIX}/lib/kde3'\n")
71 + file(APPEND ${_laname} "libdir='${CMAKE_INSTALL_PREFIX}/libx32/kde3'\n")
73 install_files(${KDE3_LIBTOOL_DIR} FILES ${_laname})
75 --- cmake-3.2.2/Modules/FindGTK2.cmake~ 2015-04-13 19:09:00.000000000 +0200
76 +++ cmake-3.2.2/Modules/FindGTK2.cmake 2015-05-24 15:59:18.104019082 +0200
78 find_path(GTK2_${_var}_INCLUDE_DIR ${_hdr}
88 --- cmake-3.2.2/Modules/CPackRPM.cmake~ 2015-04-13 19:09:00.000000000 +0200
89 +++ cmake-3.2.2/Modules/CPackRPM.cmake 2015-05-24 16:00:57.195091040 +0200
93 if (NOT DEFINED CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST)
94 - set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST /etc /etc/init.d /usr /usr/share /usr/share/doc /usr/bin /usr/lib /usr/lib64 /usr/include)
95 + set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST /etc /etc/init.d /usr /usr/share /usr/share/doc /usr/bin /usr/lib /usr/lib64 /usr/libx32 /usr/include)
96 if (CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION)
97 message("CPackRPM:Debug: Adding ${CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION} to builtin omit list.")
98 list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST "${CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION}")
99 --- cmake-3.2.2/Modules/FindDevIL.cmake~ 2015-04-13 19:09:00.000000000 +0200
100 +++ cmake-3.2.2/Modules/FindDevIL.cmake 2015-05-24 16:02:11.395903299 +0200
103 find_library(IL_LIBRARIES
105 - PATH_SUFFIXES lib64 lib lib32
106 + PATH_SUFFIXES libx32 lib64 lib lib32
107 DOC "The file that corresponds to the base il library."
112 find_library(ILUT_LIBRARIES
114 - PATH_SUFFIXES lib64 lib lib32
115 + PATH_SUFFIXES libx32 lib64 lib lib32
116 DOC "The file that corresponds to the il (system?) utility library."
121 find_library(ILU_LIBRARIES
123 - PATH_SUFFIXES lib64 lib lib32
124 + PATH_SUFFIXES libx32 lib64 lib lib32
125 DOC "The file that corresponds to the il utility library."
128 --- cmake-3.2.2/Modules/FindGLEW.cmake~ 2015-04-13 19:09:00.000000000 +0200
129 +++ cmake-3.2.2/Modules/FindGLEW.cmake 2015-05-24 16:02:42.286243557 +0200
131 # License text for the above reference.)
133 find_path(GLEW_INCLUDE_DIR GL/glew.h)
134 -find_library(GLEW_LIBRARY NAMES GLEW glew32 glew glew32s PATH_SUFFIXES lib64)
135 +find_library(GLEW_LIBRARY NAMES GLEW glew32 glew glew32s PATH_SUFFIXES lib64 libx32)
137 set(GLEW_INCLUDE_DIRS ${GLEW_INCLUDE_DIR})
138 set(GLEW_LIBRARIES ${GLEW_LIBRARY})
139 --- cmake-3.2.2/Modules/FindIce.cmake~ 2015-04-13 19:09:00.000000000 +0200
140 +++ cmake-3.2.2/Modules/FindIce.cmake 2015-05-24 16:03:30.256774179 +0200
143 # Generic 64-bit and 32-bit directories
144 list(APPEND ice_binary_suffixes "bin${_x64}" "bin")
145 - list(APPEND ice_library_suffixes "${_lib64}" "lib${_x64}" "lib")
146 + list(APPEND ice_library_suffixes "libx32" "${_lib64}" "lib${_x64}" "lib")
147 list(APPEND ice_include_suffixes "include")
148 list(APPEND ice_slice_suffixes "slice")
150 diff -urN cmake-3.1.3/Modules/Platform/UnixPaths.cmake cmake-3.1.3.x32/Modules/Platform/UnixPaths.cmake
151 --- cmake-3.1.3/Modules/Platform/UnixPaths.cmake 2015-02-11 16:17:39.000000000 +0000
152 +++ cmake-3.1.3.x32/Modules/Platform/UnixPaths.cmake 2015-03-05 21:14:33.208470807 +0000
156 list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
157 - /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64
158 + /lib /lib64 /libx32 /usr/lib /usr/lib64 /usr/libx32
161 list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
164 # Enable use of lib64 search path variants by default.
165 set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS TRUE)
166 +set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIBX32_PATHS TRUE)
167 diff -urN cmake-3.1.3/Source/cmExportInstallFileGenerator.cxx cmake-3.1.3.x32/Source/cmExportInstallFileGenerator.cxx
168 --- cmake-3.1.3/Source/cmExportInstallFileGenerator.cxx 2015-03-05 21:25:13.428466173 +0000
169 +++ cmake-3.1.3.x32/Source/cmExportInstallFileGenerator.cxx 2015-03-05 21:13:54.475137755 +0000
171 << " \"${CMAKE_CURRENT_LIST_FILE}\" PATH)\n";
172 if(cmHasLiteralPrefix(absDestS.c_str(), "/lib/") ||
173 cmHasLiteralPrefix(absDestS.c_str(), "/lib64/") ||
174 + cmHasLiteralPrefix(absDestS.c_str(), "/libx32/") ||
175 cmHasLiteralPrefix(absDestS.c_str(), "/usr/lib/") ||
176 - cmHasLiteralPrefix(absDestS.c_str(), "/usr/lib64/"))
177 + cmHasLiteralPrefix(absDestS.c_str(), "/usr/lib64/") ||
178 + cmHasLiteralPrefix(absDestS.c_str(), "/usr/libx32/"))
180 // Handle "/usr move" symlinks created by some Linux distros.
182 diff -urN cmake-3.1.3/Source/cmFindLibraryCommand.cxx cmake-3.1.3.x32/Source/cmFindLibraryCommand.cxx
183 --- cmake-3.1.3/Source/cmFindLibraryCommand.cxx 2015-02-11 16:17:39.000000000 +0000
184 +++ cmake-3.1.3.x32/Source/cmFindLibraryCommand.cxx 2015-03-05 21:07:55.938473684 +0000
189 + if(this->Makefile->GetCMakeInstance()
190 + ->GetPropertyAsBool("FIND_LIBRARY_USE_LIBX32_PATHS"))
192 + // add special 64 bit paths if this is a 64 bit compile.
193 + if(this->Makefile->PlatformIsx32Bit())
195 + this->AddArchitecturePaths("x32");
199 std::string library = this->FindLibrary();
202 diff -urN cmake-3.1.3/Source/cmFindPackageCommand.cxx cmake-3.1.3.x32/Source/cmFindPackageCommand.cxx
203 --- cmake-3.1.3/Source/cmFindPackageCommand.cxx 2015-02-11 16:17:39.000000000 +0000
204 +++ cmake-3.1.3.x32/Source/cmFindPackageCommand.cxx 2015-03-05 21:10:49.355139095 +0000
206 this->UseFindModules = true;
207 this->DebugMode = false;
208 this->UseLib64Paths = false;
209 + this->UseLibx32Paths = false;
210 this->PolicyScope = true;
211 this->VersionMajor = 0;
212 this->VersionMinor = 0;
214 this->UseLib64Paths = true;
217 + // Lookup whether libx32 paths should be used.
218 + if(this->Makefile->PlatformIsx32Bit() &&
219 + this->Makefile->GetCMakeInstance()
220 + ->GetPropertyAsBool("FIND_LIBRARY_USE_LIBX32_PATHS"))
222 + this->UseLibx32Paths = true;
225 // Check if User Package Registry should be disabled
226 if(this->Makefile->IsOn("CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY"))
228 @@ -2097,6 +2106,10 @@
230 common.push_back("lib64");
232 + if(this->UseLibx32Paths)
234 + common.push_back("libx32");
236 common.push_back("lib");
237 common.push_back("share");
239 diff -urN cmake-3.1.3/Source/cmFindPackageCommand.h cmake-3.1.3.x32/Source/cmFindPackageCommand.h
240 --- cmake-3.1.3/Source/cmFindPackageCommand.h 2015-02-11 16:17:39.000000000 +0000
241 +++ cmake-3.1.3.x32/Source/cmFindPackageCommand.h 2015-03-05 21:07:55.938473684 +0000
246 + bool UseLibx32Paths;
248 std::string LibraryArchitecture;
249 std::vector<std::string> Names;
250 diff -urN cmake-3.1.3/Source/cmMakefile.cxx cmake-3.1.3.x32/Source/cmMakefile.cxx
251 --- cmake-3.1.3/Source/cmMakefile.cxx 2015-02-11 16:17:39.000000000 +0000
252 +++ cmake-3.1.3.x32/Source/cmMakefile.cxx 2015-03-05 21:07:55.938473684 +0000
253 @@ -2370,6 +2370,15 @@
257 +bool cmMakefile::PlatformIsx32Bit() const
266 const char* cmMakefile::GetSONameFlag(const std::string& language) const
268 std::string name = "CMAKE_SHARED_LIBRARY_SONAME";
269 diff -urN cmake-3.1.3/Source/cmMakefile.h cmake-3.1.3.x32/Source/cmMakefile.h
270 --- cmake-3.1.3/Source/cmMakefile.h 2015-02-11 16:17:39.000000000 +0000
271 +++ cmake-3.1.3.x32/Source/cmMakefile.h 2015-03-05 21:07:55.938473684 +0000
274 /** Return whether the target platform is 64-bit. */
275 bool PlatformIs64Bit() const;
276 + /** Return whether the target platform is x32-bit. */
277 + bool PlatformIsx32Bit() const;
279 /** Retrieve soname flag for the specified language if supported */
280 const char* GetSONameFlag(const std::string& language) const;