diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-10-08 13:01:54 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-10-09 23:52:37 +0900 |
| commit | 52da250770e288fc1f51669a886cf206589daefc (patch) | |
| tree | 077672d52ff8ce75e19ab9a6e09e6cf0b410e294 /modules/FindTQt.cmake | |
| parent | 38529b8692626697965166c34f502c4e3fe19098 (diff) | |
| download | tde-cmake-52da250770e288fc1f51669a886cf206589daefc.tar.gz tde-cmake-52da250770e288fc1f51669a886cf206589daefc.zip | |
Use tqmoc directly instead of tmoc
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'modules/FindTQt.cmake')
| -rw-r--r-- | modules/FindTQt.cmake | 34 |
1 files changed, 6 insertions, 28 deletions
diff --git a/modules/FindTQt.cmake b/modules/FindTQt.cmake index 82c2918..1c640fc 100644 --- a/modules/FindTQt.cmake +++ b/modules/FindTQt.cmake @@ -21,38 +21,16 @@ if( NOT TQT_FOUND ) endif( ) mark_as_advanced( - TMOC_EXECUTABLE - MOC_EXECUTABLE UIC_EXECUTABLE ) - # tmoc_executable - tde_execute_process( - COMMAND pkg-config tqt --variable=tmoc_executable - OUTPUT_VARIABLE TMOC_EXECUTABLE - CACHE FILEPATH "TQt tmoc executable path" - OUTPUT_STRIP_TRAILING_WHITESPACE ) - - 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 - CACHE FILEPATH "TQt moc executable path" - OUTPUT_STRIP_TRAILING_WHITESPACE ) - - if( NOT EXISTS ${MOC_EXECUTABLE} ) - tde_message_fatal( "Path to moc is not set.\n tqt is correctly installed?" ) + # tqmoc_executable + pkg_get_variable( TQT_PREFIX tqt-mt prefix ) + find_program( TQMOC_EXECUTABLE NAMES tqmoc HINTS "${TQT_PREFIX}/bin" ) + if( NOT TQMOC_EXECUTABLE ) + tde_message_fatal( "tqmoc was NOT found.\n Please make sure TQt is correctly installed." ) endif( ) - - tqt_message( " moc path: ${MOC_EXECUTABLE}" ) - + tqt_message( " tqmoc path: ${TQMOC_EXECUTABLE}" ) # uic_executable tde_execute_process( |