From 3cc148e878b69fc3e0228f3e3bf1bbe689dad87c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 20 Feb 2015 23:17:39 -0600
Subject: [PATCH] extra-cmake-modules paths

---
 kde-modules/KDEInstallDirs.cmake | 37 ++++---------------------------------
 1 file changed, 4 insertions(+), 33 deletions(-)

diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake
index b7cd34d..2f868ac 100644
--- a/kde-modules/KDEInstallDirs.cmake
+++ b/kde-modules/KDEInstallDirs.cmake
@@ -193,37 +193,8 @@
 # (To distribute this file outside of extra-cmake-modules, substitute the full
 #  License text for the above reference.)
 
-# Figure out what the default install directory for libraries should be.
-# This is based on the logic in GNUInstallDirs, but simplified (the
-# GNUInstallDirs code deals with re-configuring, but that is dealt with
-# by the _define_* macros in this module).
+# The default library directory on NixOS is *always* /lib.
 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 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 http://wiki.debian.org/Multiarch
-if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU")
-   AND NOT CMAKE_CROSSCOMPILING)
-  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
@@ -445,15 +416,15 @@ if(KDE_INSTALL_USE_QT_SYS_PATHS)
         "QtQuick2 imports"
         QML_INSTALL_DIR)
 else()
-    _define_relative(QTPLUGINDIR LIBDIR "plugins"
+    _define_relative(QTPLUGINDIR LIBDIR "qt5/plugins"
         "Qt plugins"
         QT_PLUGIN_INSTALL_DIR)
 
-    _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "imports"
+    _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "qt5/imports"
         "QtQuick1 imports"
         IMPORTS_INSTALL_DIR)
 
-    _define_relative(QMLDIR LIBDIR "qml"
+    _define_relative(QMLDIR LIBDIR "qt5/qml"
         "QtQuick2 imports"
         QML_INSTALL_DIR)
 endif()
-- 
2.3.0