Branch: master

9d6d2fd5 2019-06-02 00:34:03 Slávek Banko 
Install the TDE integration library (libtqtkde) into TQt
plugins directory, instead of the TDE plugins directory.

Signed-off-by: Slávek Banko <slavek.banko@...>
A tqt3integration/ConfigureChecks.cmake
M tqt3integration/CMakeLists.txt
M tqt3integration/libtqtkde/CMakeLists.txt
M tqt3integration/utils/tqt/in/tqtkdeintegration_x11_0.cpp.cmake

tqt3integration/CMakeLists.txt

diff --git a/tqt3integration/CMakeLists.txt b/tqt3integration/CMakeLists.txt
index 07c10e1..4ecacf1 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 )

tqt3integration/ConfigureChecks.cmake

diff --git a/tqt3integration/ConfigureChecks.cmake b/tqt3integration/ConfigureChecks.cmake
new file mode 100644
index 0000000..9347391
--- /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
+)

tqt3integration/libtqtkde/CMakeLists.txt

diff --git a/tqt3integration/libtqtkde/CMakeLists.txt b/tqt3integration/libtqtkde/CMakeLists.txt
index 9c4c531..dbfb65e 100644
--- a/tqt3integration/libtqtkde/CMakeLists.txt
+++ b/tqt3integration/libtqtkde/CMakeLists.txt
@@ -30,5 +30,5 @@
   VERSION 0.0.0
   LINK tdeui-shared
   DEPENDENCIES generate_tqt3_bindings
-  DESTINATION "${PLUGIN_INSTALL_DIR}/plugins/integration/"
+  DESTINATION "${TQT_PLUGINS_DIR}/integration/"
 )

tqt3integration/utils/tqt/in/tqtkdeintegration_x11_0.cpp.cmake

diff --git a/tqt3integration/utils/tqt/in/tqtkdeintegration_x11_0.cpp.cmake b/tqt3integration/utils/tqt/in/tqtkdeintegration_x11_0.cpp.cmake
index b0d5fd5..bc6d9fd 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