1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
|
--- ./Source/cmFindPackageCommand.cxx
+++ ./Source/cmFindPackageCommand.cxx
@@ -2102,6 +2102,8 @@ bool cmFindPackageCommand::SearchPrefix(
// Construct list of common install locations (lib and share).
std::vector<std::string> common;
+ common.push_back("lib32");
+ common.push_back("libx32");
if(!this->LibraryArchitecture.empty())
{
common.push_back("lib/"+this->LibraryArchitecture);
--- ./Source/cmExportInstallFileGenerator.cxx
+++ ./Source/cmExportInstallFileGenerator.cxx
@@ -94,8 +94,12 @@ bool cmExportInstallFileGenerator::Gener
<< "get_filename_component(_IMPORT_PREFIX"
<< " \"${CMAKE_CURRENT_LIST_FILE}\" PATH)\n";
if(cmHasLiteralPrefix(absDestS.c_str(), "/lib/") ||
+ cmHasLiteralPrefix(absDestS.c_str(), "/lib32/") ||
+ cmHasLiteralPrefix(absDestS.c_str(), "/libx32/") ||
cmHasLiteralPrefix(absDestS.c_str(), "/lib64/") ||
cmHasLiteralPrefix(absDestS.c_str(), "/usr/lib/") ||
+ cmHasLiteralPrefix(absDestS.c_str(), "/usr/lib32/") ||
+ cmHasLiteralPrefix(absDestS.c_str(), "/usr/libx32/") ||
cmHasLiteralPrefix(absDestS.c_str(), "/usr/lib64/"))
{
// Handle "/usr move" symlinks created by some Linux distros.
--- ./Modules/GNUInstallDirs.cmake
+++ ./Modules/GNUInstallDirs.cmake
@@ -30,7 +30,7 @@
# ``LOCALSTATEDIR``
# modifiable single-machine data (var)
# ``LIBDIR``
-# object code libraries (lib or lib64 or lib/<multiarch-tuple> on Debian)
+# object code libraries (lib{,32,x32,64} or lib/<multiarch-tuple> on Debian)
# ``INCLUDEDIR``
# C header files (include)
# ``OLDINCLUDEDIR``
@@ -159,7 +159,17 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR OR (
"Unable to determine default CMAKE_INSTALL_LIBDIR directory because no target architecture is known. "
"Please enable at least one language before including GNUInstallDirs.")
else()
- if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+ if(EXISTS /usr/lib32)
+ set(_LIBDIR_DEFAULT "lib32")
+ if(DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX)
+ set(__LAST_LIBDIR_DEFAULT "lib32")
+ endif()
+ elseif(EXISTS /usr/libx32)
+ set(_LIBDIR_DEFAULT "libx32")
+ if(DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX)
+ set(__LAST_LIBDIR_DEFAULT "libx32")
+ endif()
+ elseif("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
set(_LIBDIR_DEFAULT "lib64")
if(DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX)
set(__LAST_LIBDIR_DEFAULT "lib64")
--- ./Modules/FindArmadillo.cmake
+++ ./Modules/FindArmadillo.cmake
@@ -45,7 +45,7 @@
# UNIX paths are standard, no need to write.
find_library(ARMADILLO_LIBRARY
NAMES armadillo
- PATHS "$ENV{ProgramFiles}/Armadillo/lib" "$ENV{ProgramFiles}/Armadillo/lib64" "$ENV{ProgramFiles}/Armadillo"
+ PATHS "$ENV{ProgramFiles}/Armadillo/lib" "$ENV{ProgramFiles}/Armadillo/lib32" "$ENV{ProgramFiles}/Armadillo/libx32" "$ENV{ProgramFiles}/Armadillo/lib64" "$ENV{ProgramFiles}/Armadillo"
)
find_path(ARMADILLO_INCLUDE_DIR
NAMES armadillo
--- ./Modules/CPackRPM.cmake
+++ ./Modules/CPackRPM.cmake
@@ -362,7 +362,7 @@
# list of path to be excluded.
#
# * Mandatory : NO
-# * Default : /etc /etc/init.d /usr /usr/share /usr/share/doc /usr/bin /usr/lib /usr/lib64 /usr/include
+# * Default : /etc /etc/init.d /usr /usr/share /usr/share/doc /usr/bin /usr/lib /usr/lib32 /usr/libx32 /usr/lib64 /usr/include
#
# May be used to exclude path (directories or files) from the auto-generated
# list of paths discovered by CPack RPM. The defaut value contains a
@@ -607,7 +607,7 @@ function(cpack_rpm_prepare_content_list)
endif()
if(NOT DEFINED CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST)
- 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)
+ set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST /etc /etc/init.d /usr /usr/share /usr/share/doc /usr/bin /usr/lib /usr/lib32 /usr/libx32 /usr/lib64 /usr/include)
if(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION)
message("CPackRPM:Debug: Adding ${CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION} to builtin omit list.")
list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST "${CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION}")
--- ./Modules/FindPkgConfig.cmake
+++ ./Modules/FindPkgConfig.cmake
@@ -235,10 +235,17 @@ macro(_pkg_check_modules_internal _is_re
list(APPEND _lib_dirs "lib/${CMAKE_LIBRARY_ARCHITECTURE}/pkgconfig")
endif()
else()
- # not debian, chech the FIND_LIBRARY_USE_LIB64_PATHS property
- get_property(uselib64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
- if(uselib64)
- list(APPEND _lib_dirs "lib64/pkgconfig")
+ # hard-code regardless, since there's no discovery method provided
+ if(EXISTS /usr/lib32)
+ list(APPEND _lib_dirs "lib32/pkgconfig")
+ elseif(EXISTS /usr/libx32)
+ list(APPEND _lib_dirs "libx32/pkgconfig")
+ else()
+ # not debian, check the FIND_LIBRARY_USE_LIB64_PATHS property
+ get_property(uselib64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
+ if(uselib64)
+ list(APPEND _lib_dirs "lib64/pkgconfig")
+ endif()
endif()
endif()
endif()
--- ./Modules/FindGLEW.cmake
+++ ./Modules/FindGLEW.cmake
@@ -35,7 +35,7 @@
# License text for the above reference.)
find_path(GLEW_INCLUDE_DIR GL/glew.h)
-find_library(GLEW_LIBRARY NAMES GLEW glew32 glew glew32s PATH_SUFFIXES lib64)
+find_library(GLEW_LIBRARY NAMES GLEW glew32 glew glew32s PATH_SUFFIXES lib32 libx32 lib64)
set(GLEW_INCLUDE_DIRS ${GLEW_INCLUDE_DIR})
set(GLEW_LIBRARIES ${GLEW_LIBRARY})
--- ./Modules/Platform/BlueGeneP-base.cmake
+++ ./Modules/Platform/BlueGeneP-base.cmake
@@ -45,12 +45,15 @@ set(CMAKE_SYSTEM_LIBRARY_PATH
#
# This adds directories that find commands should specifically ignore for cross compiles.
-# Most of these directories are the includeand lib directories for the frontend on BG/P systems.
+# Most of these directories are the include and lib directories for the frontend on BG/P systems.
# Not ignoring these can cause things like FindX11 to find a frontend PPC version mistakenly.
# We use this on BG instead of re-rooting because backend libraries are typically strewn about
# the filesystem, and we can't re-root ALL backend libraries to a single place.
#
set(CMAKE_SYSTEM_IGNORE_PATH
+ /lib32 /libx32
+ /usr/local/lib32 /usr/local/libx32
+ /usr/lib32 /usr/libx32
/lib /lib64 /include
/usr/lib /usr/lib64 /usr/include
/usr/local/lib /usr/local/lib64 /usr/local/include
#--- ./Modules/Platform/UnixPaths.cmake
#+++ ./Modules/Platform/UnixPaths.cmake
#@@ -83,7 +83,7 @@ list(APPEND CMAKE_SYSTEM_PROGRAM_PATH
# )
#
# list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
#- /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64
#+ /lib /lib32 /libx32 /lib64 /usr/lib /usr/lib32 /usr/libx32 /usr/lib64
# )
#
# list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
--- ./Modules/Platform/BlueGeneQ-base.cmake
+++ ./Modules/Platform/BlueGeneQ-base.cmake
@@ -41,6 +41,9 @@
# re-root ALL backend libraries to a single place.
#
set(CMAKE_SYSTEM_IGNORE_PATH
+ /lib32 /libx32
+ /usr/local/lib32 /usr/local/libx32
+ /usr/lib32 /usr/libx32
/lib /lib64 /include
/usr/lib /usr/lib64 /usr/include
/usr/local/lib /usr/local/lib64 /usr/local/include
--- ./Modules/FindOpenAL.cmake
+++ ./Modules/FindOpenAL.cmake
@@ -83,7 +83,7 @@ find_library(OPENAL_LIBRARY
NAMES OpenAL al openal OpenAL32
HINTS
ENV OPENALDIR
- PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64
+ PATH_SUFFIXES lib32 libx32 lib64 lib libs64 libs libs/Win32 libs/Win64
PATHS
~/Library/Frameworks
/Library/Frameworks
--- ./Modules/FindIce.cmake
+++ ./Modules/FindIce.cmake
@@ -157,7 +157,7 @@ function(_Ice_FIND)
endif()
# Generic 64-bit and 32-bit directories
list(APPEND ice_binary_suffixes "bin${_x64}" "bin")
- list(APPEND ice_library_suffixes "${_lib64}" "lib${_x64}" "lib")
+ list(APPEND ice_library_suffixes "lib32" "libx32" "${_lib64}" "lib${_x64}" "lib")
list(APPEND ice_include_suffixes "include")
list(APPEND ice_slice_suffixes "slice")
--- ./Modules/FindKDE3.cmake
+++ ./Modules/FindKDE3.cmake
@@ -230,7 +230,11 @@ set(QT_AND_KDECORE_LIBS ${QT_LIBRARIES}
get_filename_component(KDE3_LIB_DIR ${KDE3_KDECORE_LIBRARY} PATH )
if(NOT KDE3_LIBTOOL_DIR)
- if(KDE3_KDECORE_LIBRARY MATCHES lib64)
+ if(KDE3_KDECORE_LIBRARY MATCHES lib32)
+ set(KDE3_LIBTOOL_DIR /lib32/kde3)
+ if(KDE3_KDECORE_LIBRARY MATCHES libx32)
+ set(KDE3_LIBTOOL_DIR /libx32/kde3)
+ elseif(KDE3_KDECORE_LIBRARY MATCHES lib64)
set(KDE3_LIBTOOL_DIR /lib64/kde3)
else()
set(KDE3_LIBTOOL_DIR /lib/kde3)
--- ./Modules/FindDevIL.cmake
+++ ./Modules/FindDevIL.cmake
@@ -56,7 +56,7 @@ find_path(IL_INCLUDE_DIR il.h
find_library(IL_LIBRARIES
NAMES IL DEVIL
- PATH_SUFFIXES lib64 lib lib32
+ PATH_SUFFIXES lib lib32 libx32 lib64
DOC "The file that corresponds to the base il library."
)
@@ -64,7 +64,7 @@ find_library(IL_LIBRARIES
find_library(ILUT_LIBRARIES
NAMES ILUT
- PATH_SUFFIXES lib64 lib lib32
+ PATH_SUFFIXES lib lib32 libx32 lib64
DOC "The file that corresponds to the il (system?) utility library."
)
@@ -72,7 +72,7 @@ find_library(ILUT_LIBRARIES
find_library(ILU_LIBRARIES
NAMES ILU
- PATH_SUFFIXES lib64 lib lib32
+ PATH_SUFFIXES lib lib32 libx32 lib64
DOC "The file that corresponds to the il utility library."
)
--- ./Modules/FindGTK2.cmake
+++ ./Modules/FindGTK2.cmake
@@ -263,8 +263,12 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hd
find_path(GTK2_${_var}_INCLUDE_DIR ${_hdr}
PATHS
${_gtk2_arch_dir}
+ /usr/local/lib32
+ /usr/local/libx32
/usr/local/lib64
/usr/local/lib
+ /usr/lib32
+ /usr/libx32
/usr/lib64
/usr/lib
/usr/X11R6/include
--- ./Modules/CMakeFindPackageMode.cmake
+++ ./Modules/CMakeFindPackageMode.cmake
@@ -85,7 +85,9 @@ if(UNIX)
# from the outside
if(NOT CMAKE_SIZEOF_VOID_P)
set(CMAKE_SIZEOF_VOID_P 4)
- if(EXISTS /usr/lib64)
+ if(EXISTS /usr/lib32 OR /usr/libx32)
+ set(CMAKE_SIZEOF_VOID_P 4)
+ elseif(EXISTS /usr/lib64)
set(CMAKE_SIZEOF_VOID_P 8)
else()
# use the file utility to check whether itself is 64 bit:
--- ./CMakeLists.txt
+++ ./CMakeLists.txt
@@ -540,7 +540,7 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE)
if(BUILD_CursesDialog)
get_filename_component(_CURSES_DIR "${CURSES_LIBRARY}" PATH)
set(CURSES_NEED_RPATH FALSE)
- if(NOT "${_CURSES_DIR}" STREQUAL "/lib" AND NOT "${_CURSES_DIR}" STREQUAL "/usr/lib" AND NOT "${_CURSES_DIR}" STREQUAL "/lib64" AND NOT "${_CURSES_DIR}" STREQUAL "/usr/lib64")
+ if(NOT "${_CURSES_DIR}" STREQUAL "/lib" AND NOT "${_CURSES_DIR}" STREQUAL "/usr/lib" AND NOT "${_CURSES_DIR}" STREQUAL "/lib32" AND NOT "${_CURSES_DIR}" STREQUAL "/usr/lib32" AND NOT "${_CURSES_DIR}" STREQUAL "/lib64" AND NOT "${_CURSES_DIR}" STREQUAL "/usr/lib64")
set(CURSES_NEED_RPATH TRUE)
endif()
endif()
@@ -559,7 +559,7 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE)
endif()
set(QT_NEED_RPATH FALSE)
- if(NOT "${QT_LIBRARY_DIR}" STREQUAL "/lib" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/usr/lib" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/lib64" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/usr/lib64")
+ if(NOT "${QT_LIBRARY_DIR}" STREQUAL "/lib" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/usr/lib" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/lib32" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/usr/lib32"AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/lib64" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/usr/lib64")
set(QT_NEED_RPATH TRUE)
endif()
endif()
|
GitWeb