summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-01-28 02:10:45 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-01-28 02:10:45 -0600
commit505255701c2ed85e05da60fb6dbf8eb29ddfb793 (patch)
tree5afa43b08ad6ea9df5062285b9bf2dbb8f0734df
parenta978879a3a9706b36d511df00065f668a2069668 (diff)
downloadtqtinterface-505255701c2ed85e05da60fb6dbf8eb29ddfb793.tar.gz
tqtinterface-505255701c2ed85e05da60fb6dbf8eb29ddfb793.zip
Fix more FTBFS
-rw-r--r--qtinterface/CMakeLists.txt16
-rw-r--r--qtinterface/interface_tqt3/tqlistiterator.cpp2
2 files changed, 10 insertions, 8 deletions
diff --git a/qtinterface/CMakeLists.txt b/qtinterface/CMakeLists.txt
index d347259..fc18981 100644
--- a/qtinterface/CMakeLists.txt
+++ b/qtinterface/CMakeLists.txt
@@ -11,11 +11,19 @@
#
#################################################
+if ( NOT HAVE_REAL_TQT )
+ set( IFACE "interface_qt3" )
+else ( NOT HAVE_REAL_TQT )
+ set( IFACE "interface_tqt3" )
+endif ( NOT HAVE_REAL_TQT )
+
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/private
${QT_INCLUDE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/${IFACE}
+ ${CMAKE_CURRENT_SOURCE_DIR}/${IFACE}/private
)
link_directories(
@@ -25,12 +33,6 @@ link_directories(
##### headers ###################################
-if ( NOT HAVE_REAL_TQT )
- set( IFACE "interface_qt3" )
-else ( NOT HAVE_REAL_TQT )
- set( IFACE "interface_tqt3" )
-endif ( NOT HAVE_REAL_TQT )
-
configure_file( tqt.h.cmake tqt.h @ONLY )
install( FILES
@@ -144,7 +146,7 @@ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/tqt.pc DESTINATION ${PKGCONFIG_INSTAL
##### tqt (shared) ##############################
-tde_add_library( ${IFACE}/tqt SHARED
+tde_add_library( tqt SHARED
SOURCES
${IFACE}/tqt.cpp ${IFACE}/tqaccel.cpp ${IFACE}/tqaccessible.cpp ${IFACE}/tqaction.cpp ${IFACE}/tqapplication.cpp
${IFACE}/tqasyncio.cpp ${IFACE}/tqbuttongroup.cpp ${IFACE}/tqbutton.cpp ${IFACE}/tqcanvas.cpp ${IFACE}/tqcdestyle.cpp
diff --git a/qtinterface/interface_tqt3/tqlistiterator.cpp b/qtinterface/interface_tqt3/tqlistiterator.cpp
index 3028968..86255d0 100644
--- a/qtinterface/interface_tqt3/tqlistiterator.cpp
+++ b/qtinterface/interface_tqt3/tqlistiterator.cpp
@@ -20,7 +20,7 @@ Boston, MA 02110-1301, USA.
*/
#include <tqt.h>
-#include <ntqlistiterator.h>
+#include <tqlistiterator.h>
#ifdef USE_QT4