From 9d6d2fd57f260a4dd6c84bf6e8fab3b25422a479 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Sun, 2 Jun 2019 02:33:55 +0200
Subject: [PATCH] Install the TDE integration library (libtqtkde) into TQt
 plugins directory, instead of the TDE plugins directory.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
---
 tqt3integration/CMakeLists.txt                | 10 +++++++++-
 tqt3integration/ConfigureChecks.cmake         | 20 +++++++++++++++++++
 tqt3integration/libtqtkde/CMakeLists.txt      |  2 +-
 .../tqt/in/tqtkdeintegration_x11_0.cpp.cmake  |  2 +-
 4 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 tqt3integration/ConfigureChecks.cmake

diff --git a/tqt3integration/CMakeLists.txt b/tqt3integration/CMakeLists.txt
index 07c10e17e..4ecacf158 100644
--- a/tqt3integration/CMakeLists.txt
+++ b/tqt3integration/CMakeLists.txt
@@ -9,6 +9,14 @@
 #
 #################################################
 
+
+##### configure checks ##########################
+
+include( ConfigureChecks.cmake )
+
+
+##### subdirectories ############################
+
 add_subdirectory( libtqtkde )
 add_subdirectory( module )
-add_subdirectory( utils )
\ No newline at end of file
+add_subdirectory( utils )
diff --git a/tqt3integration/ConfigureChecks.cmake b/tqt3integration/ConfigureChecks.cmake
new file mode 100644
index 000000000..9347391d4
--- /dev/null
+++ b/tqt3integration/ConfigureChecks.cmake
@@ -0,0 +1,20 @@
+#################################################
+#
+#  (C) 2019 Slávek Banko
+#  slavek (DOT) banko (AT) axis.cz
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+
+##### check for tqt plugins dir #################
+
+execute_process(
+  COMMAND ${PKG_CONFIG_EXECUTABLE}
+    tqt-mt --variable=pluginsdir
+  OUTPUT_VARIABLE TQT_PLUGINS_DIR
+  OUTPUT_STRIP_TRAILING_WHITESPACE
+)
diff --git a/tqt3integration/libtqtkde/CMakeLists.txt b/tqt3integration/libtqtkde/CMakeLists.txt
index 9c4c5318a..dbfb65ef5 100644
--- a/tqt3integration/libtqtkde/CMakeLists.txt
+++ b/tqt3integration/libtqtkde/CMakeLists.txt
@@ -30,5 +30,5 @@ tde_add_library( tqtkde SHARED AUTOMOC
   VERSION 0.0.0
   LINK tdeui-shared
   DEPENDENCIES generate_tqt3_bindings
-  DESTINATION "${PLUGIN_INSTALL_DIR}/plugins/integration/"
+  DESTINATION "${TQT_PLUGINS_DIR}/integration/"
 )
diff --git a/tqt3integration/utils/tqt/in/tqtkdeintegration_x11_0.cpp.cmake b/tqt3integration/utils/tqt/in/tqtkdeintegration_x11_0.cpp.cmake
index b0d5fd517..bc6d9fda6 100644
--- a/tqt3integration/utils/tqt/in/tqtkdeintegration_x11_0.cpp.cmake
+++ b/tqt3integration/utils/tqt/in/tqtkdeintegration_x11_0.cpp.cmake
@@ -1 +1 @@
-#define TQTKDELIBDIR @PLUGIN_INSTALL_DIR@/plugins/integration
+#define TQTKDELIBDIR @TQT_PLUGINS_DIR@/integration