diff options
| author | samelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-03-30 21:16:35 +0000 |
|---|---|---|
| committer | samelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-03-30 21:16:35 +0000 |
| commit | 4ff1736d07f4137436bc4351ce45c30d08219c61 (patch) | |
| tree | 9d074f3186536a255241b9893f1957babc994a42 | |
| parent | 54ded844d28dbe67fadcfdf64f1e3196585a486c (diff) | |
| download | other-4ff1736d07f4137436bc4351ce45c30d08219c61.tar.gz other-4ff1736d07f4137436bc4351ce45c30d08219c61.zip | |
[cmake] rename TQt.pc to tqt.pc
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kde-common@1226585 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
| -rw-r--r-- | cmake/modules/FindTQt.cmake | 34 |
1 files changed, 13 insertions, 21 deletions
diff --git a/cmake/modules/FindTQt.cmake b/cmake/modules/FindTQt.cmake index f2180d2..ea35138 100644 --- a/cmake/modules/FindTQt.cmake +++ b/cmake/modules/FindTQt.cmake @@ -13,57 +13,49 @@ macro( tqt_message ) message( STATUS "${ARGN}" ) endmacro( ) -SET( TQT_PKGCFG_NAME "TQt" ) -pkg_search_module( TQT ${TQT_PKGCFG_NAME} ) +pkg_search_module( TQT tqt ) if( NOT TQT_FOUND ) - SET( TQT_PKGCFG_NAME "tqt" ) - pkg_search_module( TQT ${TQT_PKGCFG_NAME} ) - set( SKIP_TMOC TRUE ) - 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." ) - endif( ) + 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." ) endif( ) # tmoc_executable execute_process( - COMMAND pkg-config ${TQT_PKGCFG_NAME} --variable=tmoc_executable + COMMAND pkg-config tqt --variable=tmoc_executable OUTPUT_VARIABLE TMOC_EXECUTABLE OUTPUT_STRIP_TRAILING_WHITESPACE ) -if( NOT SKIP_TMOC ) - if( TMOC_EXECUTABLE ) - tqt_message( " tmoc path: ${TMOC_EXECUTABLE}" ) - else( ) - tde_message_fatal( "Path to tmoc is not set.\n TQt is correctly installed?" ) - endif( ) +if( TMOC_EXECUTABLE ) + tqt_message( " tmoc path: ${TMOC_EXECUTABLE}" ) +else( ) + tde_message_fatal( "Path to tmoc is not set.\n tqt is correctly installed?" ) endif( ) # moc_executable execute_process( - COMMAND pkg-config ${TQT_PKGCFG_NAME} --variable=moc_executable + COMMAND pkg-config tqt --variable=moc_executable OUTPUT_VARIABLE MOC_EXECUTABLE OUTPUT_STRIP_TRAILING_WHITESPACE ) if( MOC_EXECUTABLE ) tqt_message( " moc path: ${MOC_EXECUTABLE}" ) else( ) - tde_message_fatal( "Path to moc is not set.\n TQt is correctly installed?" ) + tde_message_fatal( "Path to moc is not set.\n tqt is correctly installed?" ) endif( ) # uic_executable execute_process( - COMMAND pkg-config ${TQT_PKGCFG_NAME} --variable=uic_executable + COMMAND pkg-config tqt --variable=uic_executable OUTPUT_VARIABLE UIC_EXECUTABLE OUTPUT_STRIP_TRAILING_WHITESPACE ) if( UIC_EXECUTABLE ) tqt_message( " uic path: ${UIC_EXECUTABLE}" ) else( ) - tde_message_fatal( "Path to uic is not set.\n TQt is correctly installed?" ) + tde_message_fatal( "Path to uic is not set.\n tqt is correctly installed?" ) endif( ) -# check if TQt is usable +# 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} ) @@ -77,7 +69,7 @@ check_cxx_source_compiles(" HAVE_USABLE_TQT ) if( NOT HAVE_USABLE_TQT ) - tde_message_fatal( "Unable to build a simple TQt test." ) + tde_message_fatal( "Unable to build a simple tqt test." ) endif( ) tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES ) |