diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2013-12-11 01:36:20 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-12-11 01:36:20 +0100 |
| commit | b67c2e559a69620288450b2140152cd231d2dcfd (patch) | |
| tree | 49f0c09047cf762dd20acf0689edc7100e53876c /qtinterface | |
| parent | ea871eed7bdfe7a2cfbcb25b23b61049b32c350a (diff) | |
| download | tqtinterface-b67c2e559a69620288450b2140152cd231d2dcfd.tar.gz tqtinterface-b67c2e559a69620288450b2140152cd231d2dcfd.zip | |
Do not build tqassistantclient for native tqt build
Embed static qassistantclient library for qt3 build
Diffstat (limited to 'qtinterface')
| -rw-r--r-- | qtinterface/CMakeLists.txt | 38 |
1 files 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 ) |