at 18.09-beta 39 lines 1.7 kB view raw
1diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake 2index 52b2eb2..a04596c 100644 3--- a/kde-modules/KDEInstallDirs.cmake 4+++ b/kde-modules/KDEInstallDirs.cmake 5@@ -232,34 +232,6 @@ 6 # GNUInstallDirs code deals with re-configuring, but that is dealt with 7 # by the _define_* macros in this module). 8 set(_LIBDIR_DEFAULT "lib") 9-# Override this default 'lib' with 'lib64' iff: 10-# - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling 11-# - we are NOT on debian 12-# - we are NOT on flatpak 13-# - we are on a 64 bits system 14-# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf 15-# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if 16-# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu" 17-# See http://wiki.debian.org/Multiarch 18-if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU") 19- AND NOT CMAKE_CROSSCOMPILING 20- AND NOT DEFINED ENV{FLATPAK_ID}) 21- if (EXISTS "/etc/debian_version") # is this a debian system ? 22- if(CMAKE_LIBRARY_ARCHITECTURE) 23- set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}") 24- endif() 25- else() # not debian, rely on CMAKE_SIZEOF_VOID_P: 26- if(NOT DEFINED CMAKE_SIZEOF_VOID_P) 27- message(AUTHOR_WARNING 28- "Unable to determine default LIB_INSTALL_LIBDIR directory because no target architecture is known. " 29- "Please enable at least one language before including KDEInstallDirs.") 30- else() 31- if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") 32- set(_LIBDIR_DEFAULT "lib64") 33- endif() 34- endif() 35- endif() 36-endif() 37 38 set(_gnu_install_dirs_vars 39 BINDIR