diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-12 22:00:03 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-12 22:00:03 -0600 |
| commit | 4ef8595d9c407d7bc8f3fa44a2b45425eb8a7b1e (patch) | |
| tree | a3c015699d177cc0f42c9552881d113332b6b9a0 | |
| parent | 0f34dbddf9837ce16427600394b9e9145edd0dc6 (diff) | |
| download | tqtinterface-4ef8595d9c407d7bc8f3fa44a2b45425eb8a7b1e.tar.gz tqtinterface-4ef8595d9c407d7bc8f3fa44a2b45425eb8a7b1e.zip | |
Add native TQt3 support to tqtinterface
| -rw-r--r-- | ConfigureChecks.cmake | 1 | ||||
| -rw-r--r-- | qtinterface/CMakeLists.txt | 9 | ||||
| -rwxr-xr-x | qtinterface/tqt-replace-stream-tqt3.cmake | 8 | ||||
| -rwxr-xr-x | qtinterface/tqt-replace-tqt3.cmake | 8 |
4 files changed, 24 insertions, 2 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index d5ff0eb..ff5fe8c 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -50,6 +50,7 @@ if( NOT DEFINED QT_INCLUDE_DIR ) if( QT_PREFIX_DIR STREQUAL "/usr" ) if( EXISTS "${QT_PREFIX_DIR}/include/tqt${QT_VERSION}" ) set( QT_INCLUDE_DIR "${QT_PREFIX_DIR}/include/tqt${QT_VERSION}" ) + set( HAVE_REAL_TQT ON CACHE BOOL "Native TQt3 detected" ) else( ) set( QT_INCLUDE_DIR "${QT_PREFIX_DIR}/include/qt${QT_VERSION}" ) endif( ) diff --git a/qtinterface/CMakeLists.txt b/qtinterface/CMakeLists.txt index 64fbb38..9803386 100644 --- a/qtinterface/CMakeLists.txt +++ b/qtinterface/CMakeLists.txt @@ -100,8 +100,13 @@ install( ##### tqt tools ################################# configure_file( tmoc.cmake tmoc @ONLY ) -configure_file( tqt-replace.cmake tqt-replace @ONLY ) -configure_file( tqt-replace-stream.cmake tqt-replace-stream @ONLY ) +if ( NOT HAVE_REAL_TQT ) + configure_file( tqt-replace.cmake tqt-replace @ONLY ) + configure_file( tqt-replace-stream.cmake tqt-replace-stream @ONLY ) +else () + configure_file( tqt-replace-tqt3.cmake tqt-replace @ONLY ) + configure_file( tqt-replace-stream-tqt3.cmake tqt-replace-stream @ONLY ) +endif () install( PROGRAMS moc-tqt uic-tqt mcopidl-tqt dcopidl-tqt dcopidlng-tqt diff --git a/qtinterface/tqt-replace-stream-tqt3.cmake b/qtinterface/tqt-replace-stream-tqt3.cmake new file mode 100755 index 0000000..ca2e985 --- /dev/null +++ b/qtinterface/tqt-replace-stream-tqt3.cmake @@ -0,0 +1,8 @@ +#!/bin/bash +QT_VERSION=@QT_VERSION@ + +if [[ $1 == "" ]]; then + echo "Usage: tqt-replace-stream <filename>" +else + cat $1 +fi diff --git a/qtinterface/tqt-replace-tqt3.cmake b/qtinterface/tqt-replace-tqt3.cmake new file mode 100755 index 0000000..df9703b --- /dev/null +++ b/qtinterface/tqt-replace-tqt3.cmake @@ -0,0 +1,8 @@ +#!/bin/bash +QT_VERSION=@QT_VERSION@ + +if [[ $1 == "" ]]; then + echo "Usage: tqt-replace <input_file>" +else + exit 0 +fi |