Browse Source

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 9d6d2fd57f)
pull/182/head
Slávek Banko 3 years ago
parent
commit
66b6ab6574
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668
  1. 10
      tqt3integration/CMakeLists.txt
  2. 20
      tqt3integration/ConfigureChecks.cmake
  3. 4
      tqt3integration/libqtkde/CMakeLists.txt
  4. 2
      tqt3integration/utils/qt/in/qtkdeintegration_x11_0.cpp.cmake

10
tqt3integration/CMakeLists.txt

@ -9,6 +9,14 @@
#
#################################################
##### configure checks ##########################
include( ConfigureChecks.cmake )
##### subdirectories ############################
add_subdirectory( libqtkde )
add_subdirectory( module )
add_subdirectory( utils )
add_subdirectory( utils )

20
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
)

4
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/"
)
DESTINATION "${TQT_PLUGINS_DIR}/integration/"
)

2
tqt3integration/utils/qt/in/qtkdeintegration_x11_0.cpp.cmake

@ -1 +1 @@
#define TQTKDELIBDIR @PLUGIN_INSTALL_DIR@/plugins/integration
#define TQTKDELIBDIR @TQT_PLUGINS_DIR@/integration

Loading…
Cancel
Save