summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-05-07 06:08:06 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-05-07 06:08:06 +0000
commit12bbadcc619b9bad22ac5b8c26984245a4a87f6f (patch)
tree0f3e9459a80f70aa14f71c6046e5961d99da0532
parentd1fb90134ab8504932ee36de6157f846b50f7415 (diff)
downloadtde-style-qtcurve-12bbadcc619b9bad22ac5b8c26984245a4a87f6f.tar.gz
tde-style-qtcurve-12bbadcc619b9bad22ac5b8c26984245a4a87f6f.zip
Fix FTBFS
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kde-style-qtcurve@1230758 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--CMakeLists.txt23
1 files changed, 14 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 032ec8a..3b6a06a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,6 +35,10 @@ endif (QTC_BUILD_CONFIG_MODULE)
if (NOT QTC_QT_ONLY)
include(KDE3Macros)
else (NOT QTC_QT_ONLY)
+ if (NOT KDE3PREFIX)
+ SET(KDE3PREFIX "/opt/trinity")
+ endif (NOT KDE3PREFIX)
+
set(QT_MT_REQUIRED TRUE)
find_package(Qt3 REQUIRED)
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake )
@@ -42,14 +46,15 @@ else (NOT QTC_QT_ONLY)
if (QT_PLUGINS_DIR MATCHES NOTFOUND)
MESSAGE(STATUS_ERROR "Qt3 package not found--assuming TQt4")
SET(QT_INCLUDE_DIR "/usr/include/qt4")
+ SET(QT_PLUGINS_DIR "${KDE3PREFIX}/lib/kde3/plugins")
endif (QT_PLUGINS_DIR MATCHES NOTFOUND)
endif (NOT QTC_QT_ONLY)
-if (NOT QTC_QT_ONLY)
+#if (NOT QTC_QT_ONLY)
exec_program(kde-config
ARGS --prefix --expandvars
OUTPUT_VARIABLE CMAKE_INSTALL_PREFIX)
-endif (NOT QTC_QT_ONLY)
+#endif (NOT QTC_QT_ONLY)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/usr/include/tqt -include tqt.h -DTQT_THREAD_SUPPORT")
@@ -86,13 +91,13 @@ if(NOT KDE4PREFIX)
endif(NOT KDE4PREFIX)
configure_file (config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
-if (NOT QTC_QT_ONLY)
+#if (NOT QTC_QT_ONLY)
add_definitions(${QT_DEFINITIONS} ${KDE3_DEFINITIONS})
include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE3_INCLUDES})
-else (NOT QTC_QT_ONLY)
- add_definitions(${QT_DEFINITIONS})
- include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
-endif (NOT QTC_QT_ONLY)
+#else (NOT QTC_QT_ONLY)
+# add_definitions(${QT_DEFINITIONS})
+# include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
+#endif (NOT QTC_QT_ONLY)
set(DATA_INSTALL_DIR ${KDE3PREFIX}/share/apps)
@@ -103,7 +108,7 @@ else(QTC_DEFAULT_TO_KDE3)
endif(QTC_DEFAULT_TO_KDE3)
add_subdirectory(style)
-if (NOT QTC_QT_ONLY)
+#if (NOT QTC_QT_ONLY)
if (QTC_BUILD_CONFIG_MODULE)
message("**************************************************************\n"
"Warning: The KDE3 config module is deprecated, and is no longer\n"
@@ -115,7 +120,7 @@ if (NOT QTC_QT_ONLY)
endif (QTC_BUILD_CONFIG_MODULE)
add_subdirectory(themes)
add_subdirectory(colors)
-endif (NOT QTC_QT_ONLY)
+#endif (NOT QTC_QT_ONLY)
if (QTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT)
message("**************************************************************\n"