diff options
-rw-r--r-- | CMakeLists.txt | 16 | ||||
-rw-r--r-- | qtmcop/CMakeLists.txt | 2 |
2 files changed, 4 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 22ce656..d794ecf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -167,20 +167,10 @@ else( GLIB2_FOUND ) endif( GLIB2_FOUND ) -##### check for Qt3 ############################# +##### check for Qt3 and TQt ##################### -find_package( Qt3 ) -if( NOT QT_FOUND ) - message(FATAL_ERROR "\nQt3 are required, but not found on your system" ) -endif( NOT QT_FOUND ) - - -##### check for TQt ############################# - -pkg_search_module( TQT TQt ) -if( NOT TQT_FOUND ) - message(FATAL_ERROR "\nTQt are required, but not found on your system" ) -endif( NOT TQT_FOUND ) +find_package( Qt ) +find_package( TQt ) ##### write config.h file ####################### diff --git a/qtmcop/CMakeLists.txt b/qtmcop/CMakeLists.txt index 48d625c..f2733c4 100644 --- a/qtmcop/CMakeLists.txt +++ b/qtmcop/CMakeLists.txt @@ -36,7 +36,7 @@ install( FILES add_custom_command( OUTPUT qiomanager_p.moc - COMMAND tqmoc ${CMAKE_CURRENT_SOURCE_DIR}/qiomanager_p.h -o qiomanager_p.moc + COMMAND ${TQT_TMOC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/qiomanager_p.h -o qiomanager_p.moc DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/qiomanager_p.h ) |