Mercurial > vanilla
changeset 771:e67c258b3b1a
dev/cmake: adapt GNUInstallDirs to Vanilla Linux
author | David Demelier <markand@malikania.fr> |
---|---|
date | Fri, 09 Aug 2019 20:40:00 +0200 |
parents | e04f8a4f9321 |
children | 1e436f54beda |
files | dev/cmake/patch-fhs.patch |
diffstat | 1 files changed, 86 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/dev/cmake/patch-fhs.patch Fri Aug 09 20:34:00 2019 +0200 +++ b/dev/cmake/patch-fhs.patch Fri Aug 09 20:40:00 2019 +0200 @@ -58,3 +58,89 @@ +set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS FALSE) +set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE) +set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIBX32_PATHS FALSE) +--- Modules/GNUInstallDirs.cmake.orig 2019-08-09 15:27:50.247607285 +0200 ++++ Modules/GNUInstallDirs.cmake 2019-08-09 15:29:28.923610316 +0200 +@@ -36,7 +36,7 @@ + # ``BINDIR`` + # user executables (``bin``) + # ``SBINDIR`` +-# system admin executables (``sbin``) ++# system admin executables (``bin``) + # ``LIBEXECDIR`` + # program executables (``libexec``) + # ``SYSCONFDIR`` +@@ -164,8 +164,8 @@ + + _GNUInstallDirs_cache_path(CMAKE_INSTALL_BINDIR "bin" + "User executables (bin)") +-_GNUInstallDirs_cache_path(CMAKE_INSTALL_SBINDIR "sbin" +- "System admin executables (sbin)") ++_GNUInstallDirs_cache_path(CMAKE_INSTALL_SBINDIR "bin" ++ "System admin executables (bin)") + _GNUInstallDirs_cache_path(CMAKE_INSTALL_LIBEXECDIR "libexec" + "Program executables (libexec)") + _GNUInstallDirs_cache_path(CMAKE_INSTALL_SYSCONFDIR "etc" +@@ -201,52 +201,6 @@ + # second time. + + set(_LIBDIR_DEFAULT "lib") +- # Override this default 'lib' with 'lib64' iff: +- # - we are on Linux system but NOT cross-compiling +- # - we are NOT on debian +- # - we are on a 64 bits system +- # reason is: amd64 ABI: https://github.com/hjl-tools/x86-psABI/wiki/X86-psABI +- # For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if +- # CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu" +- # and CMAKE_INSTALL_PREFIX is "/usr" +- # See http://wiki.debian.org/Multiarch +- if(DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX) +- set(__LAST_LIBDIR_DEFAULT "lib") +- # __LAST_LIBDIR_DEFAULT is the default value that we compute from +- # _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX, not a cache entry for +- # the value that was last used as the default. +- # This value is used to figure out whether the user changed the +- # CMAKE_INSTALL_LIBDIR value manually, or if the value was the +- # default one. When CMAKE_INSTALL_PREFIX changes, the value is +- # updated to the new default, unless the user explicitly changed it. +- endif() +- if(CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU)$" +- AND NOT CMAKE_CROSSCOMPILING) +- if (EXISTS "/etc/debian_version") # is this a debian system ? +- if(CMAKE_LIBRARY_ARCHITECTURE) +- if("${CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/?$") +- set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}") +- endif() +- if(DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX +- AND "${_GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/?$") +- set(__LAST_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}") +- endif() +- endif() +- else() # not debian, rely on CMAKE_SIZEOF_VOID_P: +- if(NOT DEFINED CMAKE_SIZEOF_VOID_P) +- message(AUTHOR_WARNING +- "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") +- set(_LIBDIR_DEFAULT "lib64") +- if(DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX) +- set(__LAST_LIBDIR_DEFAULT "lib64") +- endif() +- endif() +- endif() +- endif() +- endif() + if(NOT DEFINED CMAKE_INSTALL_LIBDIR) + set(CMAKE_INSTALL_LIBDIR "${_LIBDIR_DEFAULT}" CACHE PATH "Object code libraries (${_LIBDIR_DEFAULT})") + elseif(DEFINED __LAST_LIBDIR_DEFAULT +@@ -263,8 +217,8 @@ + + _GNUInstallDirs_cache_path(CMAKE_INSTALL_INCLUDEDIR "include" + "C header files (include)") +-_GNUInstallDirs_cache_path(CMAKE_INSTALL_OLDINCLUDEDIR "/usr/include" +- "C header files for non-gcc (/usr/include)") ++_GNUInstallDirs_cache_path(CMAKE_INSTALL_OLDINCLUDEDIR "/include" ++ "C header files for non-gcc (/include)") + _GNUInstallDirs_cache_path(CMAKE_INSTALL_DATAROOTDIR "share" + "Read-only architecture-independent data root (share)") +