diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-06-19 16:43:28 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-06-19 16:43:28 -0500 |
| commit | 246b93316fe28682e9b687ec8b6b4733f1223c27 (patch) | |
| tree | ec3f152e20e2e101ba8eec2328a7151e6011de80 | |
| parent | 7a453a2786058eafb7a89fb66de4eb09ddfd4098 (diff) | |
| download | tqtinterface-246b93316fe28682e9b687ec8b6b4733f1223c27.tar.gz tqtinterface-246b93316fe28682e9b687ec8b6b4733f1223c27.zip | |
Use tqt3 binaries if available
| -rw-r--r-- | ConfigureChecks.cmake | 4 | ||||
| -rw-r--r-- | qtinterface/CMakeLists.txt | 4 | ||||
| -rwxr-xr-x | qtinterface/uic-tqt.cmake (renamed from qtinterface/uic-tqt) | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 76579fa..7c1549d 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -105,7 +105,7 @@ if( DEFINED MOC_EXECUTABLE ) endif( ) else( ) if( QT_VERSION STREQUAL "3" ) - find_program( MOC_EXECUTABLE NAMES moc-qt3 moc HINTS "${QT_BINARY_DIR}" ) + find_program( MOC_EXECUTABLE NAMES tqmoc 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( ) @@ -144,7 +144,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-qt3 uic HINTS "${QT_BINARY_DIR}" ) + find_program( UIC_EXECUTABLE NAMES tquic 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( ) diff --git a/qtinterface/CMakeLists.txt b/qtinterface/CMakeLists.txt index 8633d8d..c0c5f74 100644 --- a/qtinterface/CMakeLists.txt +++ b/qtinterface/CMakeLists.txt @@ -110,6 +110,7 @@ install( ##### tqt tools ################################# configure_file( ${IFACE}/tmoc.cmake tmoc @ONLY ) +configure_file( uic-tqt.cmake uic-tqt @ONLY ) if ( NOT HAVE_REAL_TQT ) configure_file( tqt-replace.cmake tqt-replace @ONLY ) configure_file( tqt-replace-stream.cmake tqt-replace-stream @ONLY ) @@ -119,7 +120,8 @@ else () endif () install( PROGRAMS - moc-tqt uic-tqt mcopidl-tqt dcopidl-tqt dcopidlng-tqt + moc-tqt ${CMAKE_CURRENT_BINARY_DIR}/uic-tqt + mcopidl-tqt dcopidl-tqt dcopidlng-tqt dcopidl2cpp-tqt convert_qt_tqt1 convert_qt_tqt2 convert_qt_tqt3 ${CMAKE_CURRENT_BINARY_DIR}/tmoc ${CMAKE_CURRENT_BINARY_DIR}/tqt-replace diff --git a/qtinterface/uic-tqt b/qtinterface/uic-tqt.cmake index b355ade..51b6626 100755 --- a/qtinterface/uic-tqt +++ b/qtinterface/uic-tqt.cmake @@ -12,7 +12,7 @@ else cp -Rp $uifile $uifile.bkp tqt-replace $uifile - uic "$@" + @UIC_EXECUTABLE@ "$@" cp -Rp $uifile.bkp $uifile rm -f $uifile.bkp fi |