From b67c2e559a69620288450b2140152cd231d2dcfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Wed, 11 Dec 2013 01:36:20 +0100 Subject: [PATCH] Do not build tqassistantclient for native tqt build Embed static qassistantclient library for qt3 build --- qtinterface/CMakeLists.txt | 38 +++++++++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/qtinterface/CMakeLists.txt b/qtinterface/CMakeLists.txt index 30f4020..454c13a 100644 --- a/qtinterface/CMakeLists.txt +++ b/qtinterface/CMakeLists.txt @@ -217,11 +217,35 @@ tde_add_library( tqt SHARED ##### tqassistantclient (shared) ############################## +if ( NOT HAVE_REAL_TQT ) -tde_add_library( tqassistantclient SHARED - SOURCES - ${IFACE}/tqassistantclient.cpp - VERSION 4.2.0 - LINK ${QT_LIBRARIES} -ltqassistantclient - DESTINATION ${LIB_INSTALL_DIR} -) + find_library( QASSISTANTCLIENT_STATIC libqassistantclient.a ) + + if ( QASSISTANTCLIENT_STATIC ) + + add_library(qassistantclient STATIC IMPORTED) + set_property(TARGET qassistantclient PROPERTY + IMPORTED_LOCATION ${QASSISTANTCLIENT_STATIC}) + + tde_add_library( tqassistantclient SHARED + SOURCES + ${IFACE}/tqassistantclient.cpp + VERSION 4.2.0 + LINK ${QT_LIBRARIES} + EMBED qassistantclient + DESTINATION ${LIB_INSTALL_DIR} + ) + + else ( QASSISTANTCLIENT_STATIC ) + + tde_add_library( tqassistantclient SHARED + SOURCES + ${IFACE}/tqassistantclient.cpp + VERSION 4.2.0 + LINK ${QT_LIBRARIES} -lqassistantclient + DESTINATION ${LIB_INSTALL_DIR} + ) + + endif ( QASSISTANTCLIENT_STATIC ) + +endif ( NOT HAVE_REAL_TQT )