diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-03-05 23:27:31 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-03-05 23:27:31 -0600 |
| commit | ea715e15edb3f6b9e78d631d75e18bb9dbace497 (patch) | |
| tree | 737eb56c7e410db3dfc5abd7db7fdc22594ea6f1 /modules/FindTQt.cmake | |
| parent | 6b3a1fc54f258941ae7ae10909a23d32afee9df7 (diff) | |
| download | tde-cmake-ea715e15edb3f6b9e78d631d75e18bb9dbace497.tar.gz tde-cmake-ea715e15edb3f6b9e78d631d75e18bb9dbace497.zip | |
Added CACHE option to tde_execute_process and clean up build output
This partially closes Bug 882
Thanks to Aleksey Midenkov for the patch!
Diffstat (limited to 'modules/FindTQt.cmake')
| -rw-r--r-- | modules/FindTQt.cmake | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/modules/FindTQt.cmake b/modules/FindTQt.cmake index e354973..bf2ca8a 100644 --- a/modules/FindTQt.cmake +++ b/modules/FindTQt.cmake @@ -24,36 +24,46 @@ tde_execute_process( COMMAND pkg-config tqt --variable=tmoc_executable OUTPUT_VARIABLE TMOC_EXECUTABLE OUTPUT_STRIP_TRAILING_WHITESPACE ) -if( TMOC_EXECUTABLE ) - tqt_message( " tmoc path: ${TMOC_EXECUTABLE}" ) -else( ) - tde_message_fatal( "Path to tmoc is not set.\n tqt is correctly installed?" ) +if( NOT EXISTS ${TMOC_EXECUTABLE} ) + tde_message_fatal( "tmoc is not found!\n tqt is correctly installed?" ) endif( ) +tqt_message( " tmoc path: ${TMOC_EXECUTABLE}" ) + # moc_executable tde_execute_process( 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( ) +if( NOT EXISTS ${MOC_EXECUTABLE} ) tde_message_fatal( "Path to moc is not set.\n tqt is correctly installed?" ) endif( ) +tqt_message( " moc path: ${MOC_EXECUTABLE}" ) + # uic_executable tde_execute_process( 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?" ) +if( NOT EXISTS ${UIC_EXECUTABLE} ) + tde_message_fatal( "uic not found!\n tqt is correctly installed?" ) +endif( ) + +tqt_message( " uic path: ${UIC_EXECUTABLE}" ) + + +# tqt-replace script +set( TQT_REPLACE_SCRIPT "${TQT_PREFIX}/bin/tqt-replace" ) + +if( NOT EXISTS ${TQT_REPLACE_SCRIPT} ) + tde_message_fatal( "tqt-replace not found!\n Check tqt installation." ) endif( ) +tqt_message( " tqt-replace path: ${TQT_REPLACE_SCRIPT}" ) + # check if tqt is usable tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES ) |