diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-09-28 17:50:52 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-09-28 17:50:52 +0000 |
| commit | 18cc99e15a9d4cc989fbe2744aa5cf202254fe76 (patch) | |
| tree | bd11a0b691bcf75497410ccb4b9ff532f2a61a84 /ConfigureChecks.cmake | |
| parent | 9a8634c3f6ba13e37324deb3e3be0046169eaa2e (diff) | |
| download | tqtinterface-18cc99e15a9d4cc989fbe2744aa5cf202254fe76.tar.gz tqtinterface-18cc99e15a9d4cc989fbe2744aa5cf202254fe76.zip | |
Fix TQt3 bimary program installation names
Thanks to Mario Fetka for the patch!
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/tqtinterface@1256113 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'ConfigureChecks.cmake')
| -rw-r--r-- | ConfigureChecks.cmake | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index b405ec1..514020d 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -93,7 +93,11 @@ if( DEFINED MOC_EXECUTABLE ) tde_message_fatal( "moc was NOT found.\n MOC_EXECUTABLE may not be set correctly." ) endif( ) else( ) - find_program( MOC_EXECUTABLE NAMES moc HINTS "${QT_BINARY_DIR}" ) + if( QT_VERSION STREQUAL "3" ) + find_program( MOC_EXECUTABLE NAMES moc-qt3 moc HINTS "${QT_BINARY_DIR}" ) + elseif( QT_VERSION STREQUAL "4" ) + find_program( MOC_EXECUTABLE NAMES moc-qt4 moc HINTS "${QT_BINARY_DIR}" ) + endif( ) if( NOT MOC_EXECUTABLE ) tde_message_fatal( "moc was NOT found.\n Please check if your Qt${QT_VERSION} is correctly installed." ) endif( ) @@ -129,7 +133,7 @@ if( QT_VERSION STREQUAL "3" ) tde_message_fatal( "uic was NOT found.\n MOC_EXECUTABLE may not be set correctly" ) endif( ) else( ) - find_program( UIC_EXECUTABLE NAMES uic HINTS "${QT_BINARY_DIR}" ) + find_program( UIC_EXECUTABLE NAMES uic-qt3 uic HINTS "${QT_BINARY_DIR}" ) if( NOT UIC_EXECUTABLE ) tde_message_fatal( "uic was NOT found.\n Please check if your Qt${QT_VERSION} is correctly installed." ) endif( ) |