From a3af438d983e3f6ccc43614dd6f27de1b11a07a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Wed, 13 May 2020 19:19:59 +0200 Subject: libtdepim: Use the pkg-config file to find the TQtQUI library instead of specifying a library name based on the TQt library name. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit 68cd3324a1decb39ff4ea4900792fd0dfda58123) --- libtdepim/CMakeLists.txt | 2 +- libtdepim/ConfigureChecks.cmake | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/libtdepim/CMakeLists.txt b/libtdepim/CMakeLists.txt index f1de8d99c..15394c1e5 100644 --- a/libtdepim/CMakeLists.txt +++ b/libtdepim/CMakeLists.txt @@ -98,7 +98,7 @@ tde_add_library( tdepim SHARED AUTOMOC csshelper.cpp distributionlist.cpp kpimurlrequesterdlg.cpp sendsmsdialog.cpp kmailcompletion.cpp VERSION 1.0.0 - LINK kcal-shared tdeimproxy-shared tdeparts-shared ${TQUI_LIBRARIES} + LINK kcal-shared tdeimproxy-shared tdeparts-shared ${TQTQUI_LIBRARIES} DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/libtdepim/ConfigureChecks.cmake b/libtdepim/ConfigureChecks.cmake index d2a8f1ff2..b91f0f8f6 100644 --- a/libtdepim/ConfigureChecks.cmake +++ b/libtdepim/ConfigureChecks.cmake @@ -9,12 +9,4 @@ # ################################################# -foreach( f ${TQT_LIBRARIES} ) - if( ${f} STREQUAL "tqt-mt" ) - set(TQUI_LIBRARIES "tqui" CACHE TYPE STRING FORCE) - endif() - if( ${f} STREQUAL "qt-mt" ) - set(TQUI_LIBRARIES "qui" CACHE TYPE STRING FORCE) - endif() -endforeach() - +find_package( TQtQUI ) -- cgit v1.2.1