Detects tqt-mt instead of tqt or tqtqui.

Required to drop tqtinterface.

Signed-off-by: Michele Calgaro <[email protected]>

3 files changed, 3 insertions, 70 deletions

diff --git a/modules/FindTDE.cmake b/modules/FindTDE.cmake
index e091e62..269205e 100644
--- a/modules/FindTDE.cmake
+++ b/modules/FindTDE.cmake
@@ -13,7 +13,7 @@ if( NOT TDE_FOUND )
 
   message( STATUS "checking for 'TDE'")
 
-  pkg_search_module( TDE tqt )
+  pkg_search_module( TDE tqt-mt )
 
   if( NOT TDE_FOUND )
     tde_message_fatal( "Unable to find tdelibs!\n Try adding the directory in which the tdelibs.pc file is located\nto the PKG_CONFIG_PATH variable." )
diff --git a/modules/FindTQt.cmake b/modules/FindTQt.cmake
index 8f75c8b..e377a99 100644
--- a/modules/FindTQt.cmake
+++ b/modules/FindTQt.cmake
@@ -14,10 +14,10 @@ macro( tqt_message )
 endmacro( )
 
 if( NOT TQT_FOUND )
-  pkg_search_module( TQT tqt )
+  pkg_search_module( TQT tqt-mt )
 
   if( NOT TQT_FOUND )
-    tde_message_fatal( "Unable to find tqt!\n Try adding the directory in which the tqt.pc file is located\nto the PKG_CONFIG_PATH variable." )
+    tde_message_fatal( "Unable to find tqt!\n Please make sure TQt is correctly installed." )
   endif( )
 
   # tqmoc executable
@@ -35,34 +35,12 @@ if( NOT TQT_FOUND )
   endif( )
   tqt_message( "  tquic path: ${TQUIC_EXECUTABLE}" )
 
-
-  # check if tqt is usable
-  tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
-  set( CMAKE_REQUIRED_INCLUDES ${TQT_INCLUDE_DIRS} )
-  foreach( _dirs ${TQT_LIBRARY_DIRS} )
-    list( APPEND CMAKE_REQUIRED_LIBRARIES "-L${_dirs}" )
-  endforeach()
-  list( APPEND CMAKE_REQUIRED_LIBRARIES ${TQT_LIBRARIES} )
-
-  check_cxx_source_compiles("
-    #include <tqapplication.h>
-    int main(int argc, char **argv) { TQApplication app(argc, argv); return 0; } "
-    HAVE_USABLE_TQT )
-
-  if( NOT HAVE_USABLE_TQT )
-    tde_message_fatal( "Unable to build a simple tqt test." )
-  endif( )
-
-  tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
-
-
   # TQT_CMAKE_DIR
   if( NOT DEFINED TQT_CMAKE_DIR )
     set( TQT_CMAKE_DIR "${TQT_LIBDIR}/cmake"
          CACHE FILEPATH "Path for shared TQt CMake targets" )
   endif()
 
-
   # TQT_CXX_FLAGS
   foreach( _flag ${TQT_CFLAGS} ${TQT_CFLAGS_OTHER} )
     set( TQT_CXX_FLAGS "${TQT_CXX_FLAGS} ${_flag}" )
diff --git a/modules/FindTQtQUI.cmake b/modules/FindTQtQUI.cmake
deleted file mode 100644
index 32dd245..0000000
--- a/modules/FindTQtQUI.cmake
+++ /dev/null
@@ -1,45 +0,0 @@
-#################################################
-#
-#  (C) 2010-2011 Serghei Amelian
-#  serghei (DOT) amelian (AT) gmail.com
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
-
-macro( tqtqui_message )
-  message( STATUS "${ARGN}" )
-endmacro( )
-
-pkg_search_module( TQTQUI tqtqui )
-
-if( NOT TQTQUI_FOUND )
-  tde_message_fatal( "Unable to find tqtqui!\n Try adding the directory in which the tqtqui.pc file is located\nto the PKG_CONFIG_PATH variable." )
-endif( )
-
-# check if tqtqui is usable
-tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
-set( CMAKE_REQUIRED_INCLUDES ${TQTQUI_INCLUDE_DIRS} )
-foreach( _dirs ${TQTQUI_LIBRARY_DIRS} )
-  list( APPEND CMAKE_REQUIRED_LIBRARIES "-L${_dirs}" )
-endforeach()
-list( APPEND CMAKE_REQUIRED_LIBRARIES ${TQTQUI_LIBRARIES} )
-
-check_cxx_source_compiles("
-    #include <tqapplication.h>
-    int main(int argc, char **argv) { TQApplication app(argc, argv); return 0; } "
-  HAVE_USABLE_TQTQUI )
-
-if( NOT HAVE_USABLE_TQTQUI )
-  tde_message_fatal( "Unable to build a simple tqtqui test." )
-endif( )
-
-tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
-
-
-# TQTQUI_CXX_FLAGS
-foreach( _flag ${TQTQUI_CFLAGS_OTHER} )
-  set( TQTQUI_CXX_FLAGS "${TQTQUI_CXX_FLAGS} ${_flag}" )
-endforeach()