diff options
| author | Brad King <brad.king@kitware.com> | 2021-10-08 09:46:09 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-10-08 09:46:09 -0400 |
| commit | c352d16aafa8989b071cc10d757e4a344ac5cbbe (patch) | |
| tree | 60f4da4804d5dd1b3b6be390cf4258a4e570b38c | |
| parent | 93b25f0bd507ecd1d2b61759d8656b3e8d8de1ba (diff) | |
| parent | 6658e260d481f5e51537cffefcd3aac6844d529d (diff) | |
| download | cmake-c352d16aafa8989b071cc10d757e4a344ac5cbbe.tar.gz | |
Merge branch 'revert-debian-libexec' into release-3.19
Merge-request: !6607
| -rw-r--r-- | Modules/GNUInstallDirs.cmake | 15 | ||||
| -rw-r--r-- | Tests/RunCMake/GNUInstallDirs/Usr-Debian-stderr.txt | 4 |
2 files changed, 4 insertions, 15 deletions
diff --git a/Modules/GNUInstallDirs.cmake b/Modules/GNUInstallDirs.cmake index 13d067a2db..9ef22b9360 100644 --- a/Modules/GNUInstallDirs.cmake +++ b/Modules/GNUInstallDirs.cmake @@ -167,6 +167,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_LIBEXECDIR "libexec" + "Program executables (libexec)") _GNUInstallDirs_cache_path(CMAKE_INSTALL_SYSCONFDIR "etc" "Read-only single-machine data (etc)") _GNUInstallDirs_cache_path(CMAKE_INSTALL_SHAREDSTATEDIR "com" @@ -260,19 +262,6 @@ set(_GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" CACHE IN unset(_libdir_set) unset(__LAST_LIBDIR_DEFAULT) -if(CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU)$" - AND NOT CMAKE_CROSSCOMPILING - AND NOT EXISTS "/etc/arch-release" - AND EXISTS "/etc/debian_version" # is this a debian system ? - AND "${CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/?$") - # see https://refspecs.linuxfoundation.org/FHS_3.0/fhs-3.0.html#usrlibexec - # and https://www.debian.org/doc/debian-policy/ch-opersys#file-system-structure (section 9.1.1 bullet point 4) - _GNUInstallDirs_cache_path(CMAKE_INSTALL_LIBEXECDIR "${CMAKE_INSTALL_LIBDIR}" - "Program executables (${CMAKE_INSTALL_LIBDIR})") -else() - _GNUInstallDirs_cache_path(CMAKE_INSTALL_LIBEXECDIR "libexec" - "Program executables (libexec)") -endif() _GNUInstallDirs_cache_path(CMAKE_INSTALL_INCLUDEDIR "include" "C header files (include)") _GNUInstallDirs_cache_path(CMAKE_INSTALL_OLDINCLUDEDIR "/usr/include" diff --git a/Tests/RunCMake/GNUInstallDirs/Usr-Debian-stderr.txt b/Tests/RunCMake/GNUInstallDirs/Usr-Debian-stderr.txt index 89578ee560..c38006c301 100644 --- a/Tests/RunCMake/GNUInstallDirs/Usr-Debian-stderr.txt +++ b/Tests/RunCMake/GNUInstallDirs/Usr-Debian-stderr.txt @@ -5,7 +5,7 @@ CMAKE_INSTALL_DOCDIR='share/doc/Usr' CMAKE_INSTALL_INCLUDEDIR='include' CMAKE_INSTALL_INFODIR='share/info' CMAKE_INSTALL_LIBDIR='lib/arch' -CMAKE_INSTALL_LIBEXECDIR='lib/arch' +CMAKE_INSTALL_LIBEXECDIR='libexec' CMAKE_INSTALL_LOCALEDIR='share/locale' CMAKE_INSTALL_LOCALSTATEDIR='var' CMAKE_INSTALL_RUNSTATEDIR='var/run' @@ -20,7 +20,7 @@ CMAKE_INSTALL_FULL_DOCDIR='/usr/share/doc/Usr' CMAKE_INSTALL_FULL_INCLUDEDIR='/usr/include' CMAKE_INSTALL_FULL_INFODIR='/usr/share/info' CMAKE_INSTALL_FULL_LIBDIR='/usr/lib/arch' -CMAKE_INSTALL_FULL_LIBEXECDIR='/usr/lib/arch' +CMAKE_INSTALL_FULL_LIBEXECDIR='/usr/libexec' CMAKE_INSTALL_FULL_LOCALEDIR='/usr/share/locale' CMAKE_INSTALL_FULL_LOCALSTATEDIR='/var' CMAKE_INSTALL_FULL_RUNSTATEDIR='/var/run' |