Re: [cmake-developers] [RESEND] [PATCH] x32-abi support #15994 (without line wrapping!)
On 02/28/2017 03:38 PM, Rolf Eike Beer wrote: >> +/usr/local/libx32 >> /usr/local/lib64 >> /usr/local/lib >> +/usr/libx32 >> /usr/lib64 >> /usr/lib >> /usr/X11R6/include > And so on… > > Shouldn't we think of providing some sort of variable that holds those > things? Actually with the auto lib -> lib conversion that find_library does most of these lists aren't even needed. Some of the lists can be removed instead of extended. Such discussion is better held in the MR [1] though. -Brad [1] https://gitlab.kitware.com/cmake/cmake/merge_requests/532 -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [cmake-developers] [RESEND] [PATCH] x32-abi support #15994 (without line wrapping!)
> + PATH_SUFFIXES libx32 lib64 lib lib32
> + PATH_SUFFIXES lib64 libx32)
> +/usr/local/libx32
> /usr/local/lib64
> /usr/local/lib
> +/usr/libx32
> /usr/lib64
> /usr/lib
> /usr/X11R6/include
> + list(APPEND ice_library_suffixes "libx32" "${_lib64}" "lib${_x64}" "lib")
And so on…
Shouldn't we think of providing some sort of variable that holds those things?
Maybe one that even knows what kind of distro is used (I remember there is
some sort of lib64 special casing for Debian), so the chance of a direct hit
is bigger?
Yes, there will always be modules that need to override this (e.g. for
Windows), but it could make things a lot easier for the "normal case".
Something like GNUInstallDirs backwards or so.
Eike
--
signature.asc
Description: This is a digitally signed message part.
--
Powered by www.kitware.com
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Kitware offers various services to support the CMake community. For more
information on each offering, please visit:
CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [cmake-developers] [RESEND] [PATCH] x32-abi support #15994 (without line wrapping!)
On 02/27/2017 08:50 AM, Steven Newbury wrote: >> we now use gitlab.kitware.com merge requests. > > Right, I'll do that. For reference, the MR is [1]. Thanks, -Brad [1] https://gitlab.kitware.com/cmake/cmake/merge_requests/532 -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [cmake-developers] [RESEND] [PATCH] x32-abi support #15994 (without line wrapping!)
On Mon, 2017-02-27 at 08:36 -0500, Brad King wrote: > On 02/26/2017 08:30 PM, Steven Newbury wrote: > > This is based on the patch attached to the > > original Manits bug: > > https://cmake.org/Bug/view.php?id=15994#c40584 > > > > I have cleaned up all the hard coded paths so > > hopefully it has now no effect on non-x32 systems. > > > > It probably needs tests to be updated to support > > x32 where appropriate. > > Thanks! > > Since the related LIB_SUFFIX thread was started our preferred > path for contributions has changed. Instead of posting patches > on the mailing list, we now use gitlab.kitware.com merge requests. > Please see `CONTRIBUTING.rst` for details. > > Thanks, > -Brad Right, I'll do that. signature.asc Description: This is a digitally signed message part -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [cmake-developers] [RESEND] [PATCH] x32-abi support #15994 (without line wrapping!)
On 02/26/2017 08:30 PM, Steven Newbury wrote: > This is based on the patch attached to the > original Manits bug: > https://cmake.org/Bug/view.php?id=15994#c40584 > > I have cleaned up all the hard coded paths so > hopefully it has now no effect on non-x32 systems. > > It probably needs tests to be updated to support > x32 where appropriate. Thanks! Since the related LIB_SUFFIX thread was started our preferred path for contributions has changed. Instead of posting patches on the mailing list, we now use gitlab.kitware.com merge requests. Please see `CONTRIBUTING.rst` for details. Thanks, -Brad -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
[cmake-developers] [RESEND] [PATCH] x32-abi support #15994 (without line wrapping!)
This is based on the patch attached to the
original Manits bug:
https://cmake.org/Bug/view.php?id=15994#c40584
I have cleaned up all the hard coded paths so
hopefully it has now no effect on non-x32 systems.
It probably needs tests to be updated to support
x32 where appropriate.
---
Modules/CMakeCompilerABI.h | 3 +++
Modules/CPackRPM.cmake | 2 +-
Modules/FindDevIL.cmake | 6 +++---
Modules/FindGLEW.cmake | 2 +-
Modules/FindGTK2.cmake | 2 ++
Modules/FindIce.cmake | 2 +-
Modules/FindKDE3.cmake | 2 ++
Modules/FindOpenAL.cmake| 2 +-
Modules/FindPkgConfig.cmake | 4
Modules/GetPrerequisites.cmake | 2 +-
Modules/Platform/UnixPaths.cmake| 1 +
Source/cmExportInstallFileGenerator.cxx | 4 +++-
Source/cmFindLibraryCommand.cxx | 8
Source/cmFindPackageCommand.cxx | 11 +++
Source/cmFindPackageCommand.h | 1 +
Source/cmMakefile.cxx | 18 --
Source/cmMakefile.h | 2 ++
17 files changed, 61 insertions(+), 11 deletions(-)
diff --git a/Modules/CMakeCompilerABI.h b/Modules/CMakeCompilerABI.h
index f2714b4ea..c858fcba0 100644
--- a/Modules/CMakeCompilerABI.h
+++ b/Modules/CMakeCompilerABI.h
@@ -25,6 +25,9 @@ const char info_sizeof_dptr[] = {
#elif defined(__GNU__) && defined(__ELF__) && defined(__ARMEL__)
#define ABI_ID "ELF ARM"
+#elif defined(__linux__) && defined(__ELF__) && defined(__amd64__) &&
defined(__ILP32__)
+#define ABI_ID "ELF X32"
+
#elif defined(__ELF__)
#define ABI_ID "ELF"
#endif
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 722ee1593..b32feb541 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -1044,7 +1044,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/lib64 /usr/libx32 /usr/include)
if(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION)
if(CPACK_RPM_PACKAGE_DEBUG)
message("CPackRPM:Debug: Adding
${CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION} to builtin omit list.")
diff --git a/Modules/FindDevIL.cmake b/Modules/FindDevIL.cmake
index 45fab829c..4b868a25c 100644
--- a/Modules/FindDevIL.cmake
+++ b/Modules/FindDevIL.cmake
@@ -45,7 +45,7 @@ find_path(IL_INCLUDE_DIR il.h
find_library(IL_LIBRARIES
NAMES IL DEVIL
- PATH_SUFFIXES lib64 lib lib32
+ PATH_SUFFIXES libx32 lib64 lib lib32
DOC "The file that corresponds to the base il library."
)
@@ -53,7 +53,7 @@ find_library(IL_LIBRARIES
find_library(ILUT_LIBRARIES
NAMES ILUT
- PATH_SUFFIXES lib64 lib lib32
+ PATH_SUFFIXES libx32 lib64 lib lib32
DOC "The file that corresponds to the il (system?) utility library."
)
@@ -61,7 +61,7 @@ find_library(ILUT_LIBRARIES
find_library(ILU_LIBRARIES
NAMES ILU
- PATH_SUFFIXES lib64 lib lib32
+ PATH_SUFFIXES libx32 lib64 lib lib32
DOC "The file that corresponds to the il utility library."
)
diff --git a/Modules/FindGLEW.cmake b/Modules/FindGLEW.cmake
index d8609e64d..11e872446 100644
--- a/Modules/FindGLEW.cmake
+++ b/Modules/FindGLEW.cmake
@@ -27,7 +27,7 @@
find_path(GLEW_INCLUDE_DIR GL/glew.h)
if(NOT GLEW_LIBRARY)
- find_library(GLEW_LIBRARY_RELEASE NAMES GLEW glew32 glew glew32s
PATH_SUFFIXES lib64)
+ find_library(GLEW_LIBRARY_RELEASE NAMES GLEW glew32 glew glew32s
PATH_SUFFIXES lib64 libx32)
find_library(GLEW_LIBRARY_DEBUG NAMES GLEWd glew32d glewd PATH_SUFFIXES
lib64)
include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index 20d792467..2eca5f96c 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -292,8 +292,10 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hdr)
find_path(GTK2_${_var}_INCLUDE_DIR ${_hdr}
PATHS
${_gtk2_arch_dir}
+/usr/local/libx32
/usr/local/lib64
/usr/local/lib
+/usr/libx32
/usr/lib64
/usr/lib
/usr/X11R6/include
diff --git a/Modules/FindIce.cmake b/Modules/FindIce.cmake
index a61d4a804..e0286ee2c 100644
--- a/Modules/FindIce.cmake
+++ b/Modules/FindIce.cmake
@@ -198,7 +198,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 "libx32" "${_lib64}" "lib${_x64}" "lib")
list(APPEND ice_include_suffixes "include")
list(APPEND ice_slice_suffixes "slice")
diff --git a/Modules/FindKDE3.cmake
