diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2019-06-02 02:33:55 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2019-06-02 11:56:00 +0200 |
| commit | 66b6ab6574fff507700a32f891c8754ceec30375 (patch) | |
| tree | 839cd33e4f5167629ab729884de354208cd7b418 | |
| parent | ba298e24470b8f2d154b657cd23bb7721af5a0b6 (diff) | |
| download | tdebase-66b6ab6574fff507700a32f891c8754ceec30375.tar.gz tdebase-66b6ab6574fff507700a32f891c8754ceec30375.zip | |
Install the TDE integration library (libtqtkde) into TQt
plugins directory, instead of the TDE plugins directory.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 9d6d2fd57f260a4dd6c84bf6e8fab3b25422a479)
| -rw-r--r-- | tqt3integration/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | tqt3integration/ConfigureChecks.cmake | 20 | ||||
| -rw-r--r-- | tqt3integration/libqtkde/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tqt3integration/utils/qt/in/qtkdeintegration_x11_0.cpp.cmake | 2 |
4 files changed, 32 insertions, 4 deletions
diff --git a/tqt3integration/CMakeLists.txt b/tqt3integration/CMakeLists.txt index 01ce8a76b..c345c23e9 100644 --- a/tqt3integration/CMakeLists.txt +++ b/tqt3integration/CMakeLists.txt @@ -9,6 +9,14 @@ # ################################################# + +##### configure checks ########################## + +include( ConfigureChecks.cmake ) + + +##### subdirectories ############################ + add_subdirectory( libqtkde ) 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/libqtkde/CMakeLists.txt b/tqt3integration/libqtkde/CMakeLists.txt index 44952e35f..2a8fabb78 100644 --- a/tqt3integration/libqtkde/CMakeLists.txt +++ b/tqt3integration/libqtkde/CMakeLists.txt @@ -29,5 +29,5 @@ tde_add_library( qtkde SHARED AUTOMOC VERSION 0.0.0 LINK tdeui-shared DEPENDENCIES generate_tqt3_bindings - DESTINATION "${PLUGIN_INSTALL_DIR}/plugins/integration/" -)
\ No newline at end of file + DESTINATION "${TQT_PLUGINS_DIR}/integration/" +) diff --git a/tqt3integration/utils/qt/in/qtkdeintegration_x11_0.cpp.cmake b/tqt3integration/utils/qt/in/qtkdeintegration_x11_0.cpp.cmake index b0d5fd517..bc6d9fda6 100644 --- a/tqt3integration/utils/qt/in/qtkdeintegration_x11_0.cpp.cmake +++ b/tqt3integration/utils/qt/in/qtkdeintegration_x11_0.cpp.cmake @@ -1 +1 @@ -#define TQTKDELIBDIR @PLUGIN_INSTALL_DIR@/plugins/integration +#define TQTKDELIBDIR @TQT_PLUGINS_DIR@/integration |