[rkward-cvs] SF.net SVN: rkward: [2041] branches/KDE4_port
tfry at users.sourceforge.net
tfry at users.sourceforge.net
Mon Oct 8 15:43:03 UTC 2007
Revision: 2041
http://rkward.svn.sourceforge.net/rkward/?rev=2041&view=rev
Author: tfry
Date: 2007-10-08 08:43:02 -0700 (Mon, 08 Oct 2007)
Log Message:
-----------
Start building for KDE4, now (of course this will not work at all, yet)
Modified Paths:
--------------
branches/KDE4_port/CMakeLists.txt
branches/KDE4_port/TODO_KDE4
branches/KDE4_port/doc/CMakeLists.txt
branches/KDE4_port/doc/en/CMakeLists.txt
branches/KDE4_port/rkward/CMakeLists.txt
branches/KDE4_port/rkward/agents/CMakeLists.txt
branches/KDE4_port/rkward/core/CMakeLists.txt
branches/KDE4_port/rkward/dataeditor/CMakeLists.txt
branches/KDE4_port/rkward/dialogs/CMakeLists.txt
branches/KDE4_port/rkward/icons/CMakeLists.txt
branches/KDE4_port/rkward/misc/CMakeLists.txt
branches/KDE4_port/rkward/plugin/CMakeLists.txt
branches/KDE4_port/rkward/rbackend/CMakeLists.txt
branches/KDE4_port/rkward/rbackend/FindR.cmake
branches/KDE4_port/rkward/rbackend/rpackages/CMakeLists.txt
branches/KDE4_port/rkward/scriptbackends/CMakeLists.txt
branches/KDE4_port/rkward/settings/CMakeLists.txt
branches/KDE4_port/rkward/syntax/CMakeLists.txt
branches/KDE4_port/rkward/windows/CMakeLists.txt
Modified: branches/KDE4_port/CMakeLists.txt
===================================================================
--- branches/KDE4_port/CMakeLists.txt 2007-10-08 15:10:22 UTC (rev 2040)
+++ branches/KDE4_port/CMakeLists.txt 2007-10-08 15:43:02 UTC (rev 2041)
@@ -1,18 +1,18 @@
PROJECT(rkward)
-FIND_PACKAGE(KDE3 REQUIRED)
-INCLUDE(KDE3Macros)
+FIND_PACKAGE(KDE4 REQUIRED)
+
SET(CMAKE_VERBOSE_MAKEFILE ON)
-ADD_DEFINITIONS(${QT_DEFINITIONS} ${KDE3_DEFINITIONS})
+ADD_DEFINITIONS(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
-LINK_DIRECTORIES(${KDE3_LIB_DIR})
+LINK_DIRECTORIES(${KDE4_LIB_DIR})
ADD_SUBDIRECTORY( rkward )
ADD_SUBDIRECTORY( po )
ADD_SUBDIRECTORY( doc )
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR} )
+INCLUDE_DIRECTORIES( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
# TODO: figure out how to make source distributions (with REAMDE files, etc.)
Modified: branches/KDE4_port/TODO_KDE4
===================================================================
--- branches/KDE4_port/TODO_KDE4 2007-10-08 15:10:22 UTC (rev 2040)
+++ branches/KDE4_port/TODO_KDE4 2007-10-08 15:43:02 UTC (rev 2041)
@@ -5,7 +5,6 @@
- need to replace hard-coded "share/apps"?
- icons
- rkward.desktop
-- KDE3 -> KDE4
- test
- configuration
- R
Modified: branches/KDE4_port/doc/CMakeLists.txt
===================================================================
--- branches/KDE4_port/doc/CMakeLists.txt 2007-10-08 15:10:22 UTC (rev 2040)
+++ branches/KDE4_port/doc/CMakeLists.txt 2007-10-08 15:43:02 UTC (rev 2041)
@@ -1,3 +1,3 @@
ADD_SUBDIRECTORY( en )
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR} )
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDE_DIR} )
Modified: branches/KDE4_port/doc/en/CMakeLists.txt
===================================================================
--- branches/KDE4_port/doc/en/CMakeLists.txt 2007-10-08 15:10:22 UTC (rev 2040)
+++ branches/KDE4_port/doc/en/CMakeLists.txt 2007-10-08 15:43:02 UTC (rev 2041)
@@ -1,4 +1,4 @@
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR} )
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDE_DIR} )
########### install files ###############
Modified: branches/KDE4_port/rkward/CMakeLists.txt
===================================================================
--- branches/KDE4_port/rkward/CMakeLists.txt 2007-10-08 15:10:22 UTC (rev 2040)
+++ branches/KDE4_port/rkward/CMakeLists.txt 2007-10-08 15:43:02 UTC (rev 2041)
@@ -11,7 +11,7 @@
ADD_SUBDIRECTORY( windows )
ADD_SUBDIRECTORY( syntax )
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR} )
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDE_DIR} )
SET(RKWard_Sources
rkward.cpp
@@ -26,17 +26,17 @@
########### next target ###############
# auto-gen sources
-KDE3_AUTOMOC(${RKWard_Sources})
-KDE3_ADD_DCOP_SKELS(RKWard_Sources rkward.h)
+QT4_AUTOMOC(${RKWard_Sources})
+#KDE4_ADD_DCOP_SKELS(RKWard_Sources rkward.h)
# somehow the needed libdirs for R do not get passed down automatically
GET_DIRECTORY_PROPERTY(R_SHAREDLIBDIR DIRECTORY rbackend LINK_DIRECTORIES)
LINK_DIRECTORIES(${R_SHAREDLIBDIR})
-KDE3_ADD_EXECUTABLE(rkward.bin ${RKWard_Sources})
+KDE4_ADD_EXECUTABLE(rkward.bin ${RKWard_Sources})
-TARGET_LINK_LIBRARIES(rkward.bin ${QT_AND_KDECORE_LIBS} windows agents dialogs plugin settings dataeditor core scriptbackends rbackend misc khtml kmdi kdeui katepartinterfaces )
+TARGET_LINK_LIBRARIES(rkward.bin ${KDE4_KDECORE_LIBS} windows agents dialogs plugin settings dataeditor core scriptbackends rbackend misc khtml kmdi ${KDE4_KDEUI_LIBS} katepartinterfaces )
# wrapper script
GET_DIRECTORY_PROPERTY(R_HOME DIRECTORY rbackend DEFINITION R_HOME)
@@ -49,12 +49,12 @@
########### install files ###############
-INSTALL(DIRECTORY plugins/ pages DESTINATION share/apps/rkward
+INSTALL(DIRECTORY plugins/ pages DESTINATION ${DATA_INSTALL_DIR}rkward
PATTERN .svn EXCLUDE)
-INSTALL(FILES rkwardui.rc rkconsolepart.rc DESTINATION share/apps/rkward )
-INSTALL(TARGETS rkward.bin DESTINATION bin)
-INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/rkward DESTINATION bin)
+INSTALL(FILES rkwardui.rc rkconsolepart.rc DESTINATION ${DATA_INSTALL_DIR}/rkward )
+INSTALL(TARGETS rkward.bin DESTINATION ${BIN_INSTALL_DIR})
+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/rkward DESTINATION ${BIN_INSTALL_DIR})
# TODO:
#INSTALL(FILES rkward.desktop DESTINATION ${XDG_APPS_DIR})
Modified: branches/KDE4_port/rkward/agents/CMakeLists.txt
===================================================================
--- branches/KDE4_port/rkward/agents/CMakeLists.txt 2007-10-08 15:10:22 UTC (rev 2040)
+++ branches/KDE4_port/rkward/agents/CMakeLists.txt 2007-10-08 15:43:02 UTC (rev 2041)
@@ -1,4 +1,4 @@
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR} )
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDE_DIR} )
########### next target ###############
@@ -11,7 +11,7 @@
rkeditobjectagent.cpp
)
-KDE3_AUTOMOC(${agents_STAT_SRCS})
+QT4_AUTOMOC(${agents_STAT_SRCS})
ADD_LIBRARY(agents STATIC ${agents_STAT_SRCS})
Modified: branches/KDE4_port/rkward/core/CMakeLists.txt
===================================================================
--- branches/KDE4_port/rkward/core/CMakeLists.txt 2007-10-08 15:10:22 UTC (rev 2040)
+++ branches/KDE4_port/rkward/core/CMakeLists.txt 2007-10-08 15:43:02 UTC (rev 2041)
@@ -1,4 +1,4 @@
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR} )
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDE_DIR} )
########### next target ###############
@@ -13,7 +13,7 @@
renvironmentobject.cpp
)
-KDE3_AUTOMOC(${core_STAT_SRCS})
+QT4_AUTOMOC(${core_STAT_SRCS})
ADD_LIBRARY(core STATIC ${core_STAT_SRCS})
Modified: branches/KDE4_port/rkward/dataeditor/CMakeLists.txt
===================================================================
--- branches/KDE4_port/rkward/dataeditor/CMakeLists.txt 2007-10-08 15:10:22 UTC (rev 2040)
+++ branches/KDE4_port/rkward/dataeditor/CMakeLists.txt 2007-10-08 15:43:02 UTC (rev 2041)
@@ -1,4 +1,4 @@
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR} )
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDE_DIR} )
########### next target ###############
@@ -17,7 +17,7 @@
rkeditordataframepart.cpp
)
-KDE3_AUTOMOC(${dataeditor_STAT_SRCS})
+QT4_AUTOMOC(${dataeditor_STAT_SRCS})
ADD_LIBRARY(dataeditor STATIC ${dataeditor_STAT_SRCS})
Modified: branches/KDE4_port/rkward/dialogs/CMakeLists.txt
===================================================================
--- branches/KDE4_port/rkward/dialogs/CMakeLists.txt 2007-10-08 15:10:22 UTC (rev 2040)
+++ branches/KDE4_port/rkward/dialogs/CMakeLists.txt 2007-10-08 15:43:02 UTC (rev 2041)
@@ -1,4 +1,4 @@
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR} )
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDE_DIR} )
########### next target ###############
@@ -10,7 +10,7 @@
rkimportdialog.cpp
)
-KDE3_AUTOMOC(${dialogs_STAT_SRCS})
+QT4_AUTOMOC(${dialogs_STAT_SRCS})
ADD_LIBRARY(dialogs STATIC ${dialogs_STAT_SRCS})
Modified: branches/KDE4_port/rkward/icons/CMakeLists.txt
===================================================================
--- branches/KDE4_port/rkward/icons/CMakeLists.txt 2007-10-08 15:10:22 UTC (rev 2040)
+++ branches/KDE4_port/rkward/icons/CMakeLists.txt 2007-10-08 15:43:02 UTC (rev 2041)
@@ -1,11 +1,11 @@
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR} )
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDE_DIR} )
########### install files ###############
-INSTALL(FILES rkward_logo.png function.png list.png window_back.png window_forward.png run_line.png run_selection.png run_all.png DESTINATION /share/apps/rkward/icons )
+INSTALL(FILES rkward_logo.png function.png list.png window_back.png window_forward.png run_line.png run_selection.png run_all.png DESTINATION ${DATA_INSTALL_DIR}/rkward/icons )
-KDE3_INSTALL_ICONS( hicolor )
+KDE4_INSTALL_ICONS( hicolor )
Modified: branches/KDE4_port/rkward/misc/CMakeLists.txt
===================================================================
--- branches/KDE4_port/rkward/misc/CMakeLists.txt 2007-10-08 15:10:22 UTC (rev 2040)
+++ branches/KDE4_port/rkward/misc/CMakeLists.txt 2007-10-08 15:43:02 UTC (rev 2041)
@@ -1,4 +1,4 @@
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR} )
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDE_DIR} )
########### next target ###############
@@ -16,7 +16,7 @@
rkdummypart.cpp
)
-KDE3_AUTOMOC(${misc_STAT_SRCS})
+QT4_AUTOMOC(${misc_STAT_SRCS})
ADD_LIBRARY(misc STATIC ${misc_STAT_SRCS})
Modified: branches/KDE4_port/rkward/plugin/CMakeLists.txt
===================================================================
--- branches/KDE4_port/rkward/plugin/CMakeLists.txt 2007-10-08 15:10:22 UTC (rev 2040)
+++ branches/KDE4_port/rkward/plugin/CMakeLists.txt 2007-10-08 15:43:02 UTC (rev 2041)
@@ -1,4 +1,4 @@
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR} )
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDE_DIR} )
########### next target ###############
@@ -26,7 +26,7 @@
rkabstractoptionselector.cpp
)
-KDE3_AUTOMOC(${plugin_STAT_SRCS})
+QT4_AUTOMOC(${plugin_STAT_SRCS})
ADD_LIBRARY(plugin STATIC ${plugin_STAT_SRCS})
Modified: branches/KDE4_port/rkward/rbackend/CMakeLists.txt
===================================================================
--- branches/KDE4_port/rkward/rbackend/CMakeLists.txt 2007-10-08 15:10:22 UTC (rev 2040)
+++ branches/KDE4_port/rkward/rbackend/CMakeLists.txt 2007-10-08 15:43:02 UTC (rev 2041)
@@ -3,7 +3,7 @@
ADD_SUBDIRECTORY( rpackages )
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR} )
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDE_DIR} )
########### next target ###############
@@ -19,7 +19,7 @@
rklocalesupport.cpp
)
-KDE3_AUTOMOC(${rbackend_STAT_SRCS})
+QT4_AUTOMOC(${rbackend_STAT_SRCS})
ADD_LIBRARY(rbackend STATIC ${rbackend_STAT_SRCS})
TARGET_LINK_LIBRARIES(rbackend ${R_USED_LIBS})
Modified: branches/KDE4_port/rkward/rbackend/FindR.cmake
===================================================================
--- branches/KDE4_port/rkward/rbackend/FindR.cmake 2007-10-08 15:10:22 UTC (rev 2040)
+++ branches/KDE4_port/rkward/rbackend/FindR.cmake 2007-10-08 15:43:02 UTC (rev 2041)
@@ -130,7 +130,6 @@
IF(NOT EXISTS ${R_LIBDIR})
MESSAGE(FATAL_ERROR "${R_LIBDIR} does not exist")
-ENDIF(NOT EXISTS ${R_LIBDIR})
+ELSE(NOT EXISTS ${R_LIBDIR})
MESSAGE(STATUS "Will use ${R_LIBDIR}")
ENDIF(NOT EXISTS ${R_LIBDIR})
-
Modified: branches/KDE4_port/rkward/rbackend/rpackages/CMakeLists.txt
===================================================================
--- branches/KDE4_port/rkward/rbackend/rpackages/CMakeLists.txt 2007-10-08 15:10:22 UTC (rev 2040)
+++ branches/KDE4_port/rkward/rbackend/rpackages/CMakeLists.txt 2007-10-08 15:43:02 UTC (rev 2041)
@@ -1,4 +1,4 @@
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR} )
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDE_DIR} )
CONFIGURE_FILE(
"${CMAKE_CURRENT_SOURCE_DIR}/rpackage_install.cmake.in"
Modified: branches/KDE4_port/rkward/scriptbackends/CMakeLists.txt
===================================================================
--- branches/KDE4_port/rkward/scriptbackends/CMakeLists.txt 2007-10-08 15:10:22 UTC (rev 2040)
+++ branches/KDE4_port/rkward/scriptbackends/CMakeLists.txt 2007-10-08 15:43:02 UTC (rev 2041)
@@ -1,4 +1,4 @@
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR} )
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDE_DIR} )
########### next target ###############
@@ -9,14 +9,14 @@
simplebackend.cpp
)
-KDE3_AUTOMOC(${scriptbackends_STAT_SRCS})
+QT4_AUTOMOC(${scriptbackends_STAT_SRCS})
ADD_LIBRARY(scriptbackends STATIC ${scriptbackends_STAT_SRCS})
########### install files ###############
-INSTALL(FILES common.php php.ini DESTINATION /share/apps/rkward/phpfiles )
+INSTALL(FILES common.php php.ini DESTINATION ${DATA_INSTALL_DIR}/rkward/phpfiles )
Modified: branches/KDE4_port/rkward/settings/CMakeLists.txt
===================================================================
--- branches/KDE4_port/rkward/settings/CMakeLists.txt 2007-10-08 15:10:22 UTC (rev 2040)
+++ branches/KDE4_port/rkward/settings/CMakeLists.txt 2007-10-08 15:43:02 UTC (rev 2041)
@@ -1,4 +1,4 @@
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR} )
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDE_DIR} )
########### next target ###############
@@ -16,7 +16,7 @@
rksettingsmoduleconsole.cpp
)
-KDE3_AUTOMOC(${settings_STAT_SRCS})
+QT4_AUTOMOC(${settings_STAT_SRCS})
ADD_LIBRARY(settings STATIC ${settings_STAT_SRCS})
Modified: branches/KDE4_port/rkward/syntax/CMakeLists.txt
===================================================================
--- branches/KDE4_port/rkward/syntax/CMakeLists.txt 2007-10-08 15:10:22 UTC (rev 2040)
+++ branches/KDE4_port/rkward/syntax/CMakeLists.txt 2007-10-08 15:43:02 UTC (rev 2041)
@@ -1,8 +1,8 @@
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR} )
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDE_DIR} )
########### install files ###############
-INSTALL(FILES r.xml rkward.xml DESTINATION /share/apps/katepart/syntax/ )
+INSTALL(FILES r.xml rkward.xml DESTINATION ${DATA_INSTALL_DIR}/katepart/syntax/ )
# r-syntax-test.R is not installed
Modified: branches/KDE4_port/rkward/windows/CMakeLists.txt
===================================================================
--- branches/KDE4_port/rkward/windows/CMakeLists.txt 2007-10-08 15:10:22 UTC (rev 2040)
+++ branches/KDE4_port/rkward/windows/CMakeLists.txt 2007-10-08 15:43:02 UTC (rev 2041)
@@ -1,4 +1,4 @@
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR} )
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDE_DIR} )
########### next target ###############
@@ -20,7 +20,7 @@
rkfilebrowser.cpp
)
-KDE3_AUTOMOC(${windows_STAT_SRCS})
+QT4_AUTOMOC(${windows_STAT_SRCS})
ADD_LIBRARY(windows STATIC ${windows_STAT_SRCS})
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the rkward-tracker
mailing list