From 7b227bd6ed94b3972dc84667dd5c726fa488c6e8 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 8 May 2011 06:58:59 +0000 Subject: [PATCH] Fix up build system for TQt git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kgtk-qt3@1230843 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- CMakeLists.txt | 4 ++++ kdialogd3/CMakeLists.txt | 5 +++++ qt3/CMakeLists.txt | 5 +++++ 3 files changed, 14 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index f136f8e..72c65d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,6 +16,10 @@ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) include(CheckFunctionExists) check_function_exists(getpeereid HAVE_GETPEEREID) +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/usr/include/tqt -include tqt.h -DTQT_THREAD_SUPPORT") +SET(QT_UIC_EXECUTABLE "/usr/bin/uic-tqt") +#SET(QT_MOC_EXECUTABLE "/usr/bin/tmoc") + if (NOT "${KGTK_KDE3}" MATCHES "false") add_subdirectory(kdialogd3) endif (NOT "${KGTK_KDE3}" MATCHES "false") diff --git a/kdialogd3/CMakeLists.txt b/kdialogd3/CMakeLists.txt index 6e054c1..2ee2569 100644 --- a/kdialogd3/CMakeLists.txt +++ b/kdialogd3/CMakeLists.txt @@ -2,6 +2,11 @@ set(QT_MT_REQUIRED TRUE) find_package(KDE3) find_package(Qt3) +if (NOT QT_INCLUDE_DIR) + MESSAGE(STATUS_ERROR "Qt3 package not found--assuming TQt4") + SET(QT_INCLUDE_DIR "/usr/include/qt4" CACHE PATH "" FORCE) +endif (NOT QT_INCLUDE_DIR) + if (KDE3_INCLUDE_DIR) message("** INFORMATION: KDialogD for KDE3 will be built.") link_directories(${KDE3_LIB_DIR}) diff --git a/qt3/CMakeLists.txt b/qt3/CMakeLists.txt index b35b6b7..bfada15 100644 --- a/qt3/CMakeLists.txt +++ b/qt3/CMakeLists.txt @@ -1,6 +1,11 @@ set(QT_MT_REQUIRED TRUE) find_package(Qt3) +if (NOT QT_INCLUDE_DIR) + MESSAGE(STATUS_ERROR "Qt3 package not found--assuming TQt4") + SET(QT_INCLUDE_DIR "/usr/include/qt4" CACHE PATH "" FORCE) +endif (NOT QT_INCLUDE_DIR) + if (QT_INCLUDE_DIR) message("** INFORMATION: Qt3 LD_PRELOAD library will be built.")