mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-25 03:17:13 +00:00
40 lines
1.6 KiB
Diff
40 lines
1.6 KiB
Diff
diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake
|
|
index 275fd65..a04596c 100644
|
|
--- a/kde-modules/KDEInstallDirs.cmake
|
|
+++ b/kde-modules/KDEInstallDirs.cmake
|
|
@@ -232,34 +232,6 @@
|
|
# GNUInstallDirs code deals with re-configuring, but that is dealt with
|
|
# by the _define_* macros in this module).
|
|
set(_LIBDIR_DEFAULT "lib")
|
|
-# Override this default 'lib' with 'lib64' iff:
|
|
-# - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling
|
|
-# - we are NOT on debian
|
|
-# - we are NOT on flatpak
|
|
-# - we are on a 64 bits system
|
|
-# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
|
|
-# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
|
|
-# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
|
|
-# See https://wiki.debian.org/Multiarch
|
|
-if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU")
|
|
- AND NOT CMAKE_CROSSCOMPILING
|
|
- AND NOT DEFINED ENV{FLATPAK_ID})
|
|
- if (EXISTS "/etc/debian_version") # is this a debian system ?
|
|
- if(CMAKE_LIBRARY_ARCHITECTURE)
|
|
- set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
|
|
- endif()
|
|
- else() # not debian, rely on CMAKE_SIZEOF_VOID_P:
|
|
- if(NOT DEFINED CMAKE_SIZEOF_VOID_P)
|
|
- message(AUTHOR_WARNING
|
|
- "Unable to determine default LIB_INSTALL_LIBDIR directory because no target architecture is known. "
|
|
- "Please enable at least one language before including KDEInstallDirs.")
|
|
- else()
|
|
- if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
|
|
- set(_LIBDIR_DEFAULT "lib64")
|
|
- endif()
|
|
- endif()
|
|
- endif()
|
|
-endif()
|
|
|
|
set(_gnu_install_dirs_vars
|
|
BINDIR
|