summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2015-06-14 01:42:08 (GMT)
committer Slávek Banko <slavek.banko@axis.cz>2015-06-14 01:42:08 (GMT)
commit14243cc8ead795531e47954763cc8b1bec94a092 (patch)
treee8eb32bf77f79ee8b2e77d6044911b4b0e669463
parentf17c618004e799eb1ae9dc35907a7b9431968ba2 (diff)
downloadtdelibs-14243cc8.zip
tdelibs-14243cc8.tar.gz
Fix detection for option TDEINIT_USE_XFT with CMake build
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--CMakeLists.txt9
-rw-r--r--tdeinit/CMakeLists.txt2
2 files changed, 9 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 19a8438..ca577fe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -824,10 +824,17 @@ endif( WITH_ARTS )
##### check for Xft #############################
+string( REGEX REPLACE ".*;([^;]*qt-mt);.*" "\\1" TQT_MT ";${TQT_LIBRARIES};" )
+if( TQT_MT )
+ pkg_search_module( TQT_MT ${TQT_MT} )
+ tde_save_and_set( CMAKE_REQUIRED_LIBRARIES "${TQT_MT_LIBRARIES}" )
+ check_library_exists( tqt-mt XftInit "" TDEINIT_USE_XFT )
+ tde_restore( CMAKE_REQUIRED_LIBRARIES )
+endif( TQT_MT )
if( TDEINIT_USE_XFT )
pkg_search_module( XFT xft )
if( NOT XFT_FOUND )
- message(FATAL_ERROR "\nXft are required, but not found on your system" )
+ tde_message_fatal( "Xft is required, but not found on your system" )
endif( NOT XFT_FOUND )
endif( TDEINIT_USE_XFT )
diff --git a/tdeinit/CMakeLists.txt b/tdeinit/CMakeLists.txt
index f4124e5..346bfa2 100644
--- a/tdeinit/CMakeLists.txt
+++ b/tdeinit/CMakeLists.txt
@@ -40,7 +40,7 @@ set( ${target}_SRCS
tde_add_executable( ${target}
SOURCES ${${target}_SRCS}
- LINK ltdlc-static tdeparts-shared
+ LINK ltdlc-static tdeparts-shared ${XFT_LIBRARIES}
DESTINATION ${BIN_INSTALL_DIR}
)