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
v3.5.13-sru
tpearson 13 years ago
parent 9a8634c3f6
commit 18cc99e15a

@ -93,7 +93,11 @@ if( DEFINED MOC_EXECUTABLE )
tde_message_fatal( "moc was NOT found.\n MOC_EXECUTABLE may not be set correctly." ) tde_message_fatal( "moc was NOT found.\n MOC_EXECUTABLE may not be set correctly." )
endif( ) endif( )
else( ) 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 ) if( NOT MOC_EXECUTABLE )
tde_message_fatal( "moc was NOT found.\n Please check if your Qt${QT_VERSION} is correctly installed." ) tde_message_fatal( "moc was NOT found.\n Please check if your Qt${QT_VERSION} is correctly installed." )
endif( ) 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" ) tde_message_fatal( "uic was NOT found.\n MOC_EXECUTABLE may not be set correctly" )
endif( ) endif( )
else( ) 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 ) if( NOT UIC_EXECUTABLE )
tde_message_fatal( "uic was NOT found.\n Please check if your Qt${QT_VERSION} is correctly installed." ) tde_message_fatal( "uic was NOT found.\n Please check if your Qt${QT_VERSION} is correctly installed." )
endif( ) endif( )

Loading…
Cancel
Save