[rkward/frameworks] /: Run apdapt_cmakelists_file.pl script, and further adjustments to CMakeLists.txt.
Thomas Friedrichsmeier
thomas.friedrichsmeier at ruhr-uni-bochum.de
Mon Jun 1 18:38:07 UTC 2015
Git commit a05690f3473b4d4080bd41934c91cbe07ebaab86 by Thomas Friedrichsmeier.
Committed on 01/06/2015 at 11:50.
Pushed by tfry into branch 'frameworks'.
Run apdapt_cmakelists_file.pl script, and further adjustments to CMakeLists.txt.
CMake-Stage can run succeessfully, now (which does not mean it is all correct, already)
M +3 -3 CMakeLists.txt
M +2 -2 doc/rkward/CMakeLists.txt
M +3 -2 doc/rkwardplugins/CMakeLists.txt
M +3 -3 rkward/CMakeLists.txt
M +1 -1 rkward/agents/CMakeLists.txt
M +1 -1 rkward/core/CMakeLists.txt
M +1 -1 rkward/dataeditor/CMakeLists.txt
M +1 -1 rkward/dialogs/CMakeLists.txt
M +1 -1 rkward/misc/CMakeLists.txt
M +1 -1 rkward/plugin/CMakeLists.txt
M +2 -2 rkward/qwinhost/CMakeLists.txt
M +1 -1 rkward/rbackend/CMakeLists.txt
M +1 -1 rkward/rbackend/rkwarddevice/CMakeLists.txt
M +1 -1 rkward/rbackend/rpackages/CMakeLists.txt
M +1 -1 rkward/scriptbackends/CMakeLists.txt
M +1 -1 rkward/settings/CMakeLists.txt
M +1 -1 rkward/windows/CMakeLists.txt
http://commits.kde.org/rkward/a05690f3473b4d4080bd41934c91cbe07ebaab86
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b96120e..266a7c1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,11 +13,11 @@ SET(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
INCLUDE(KDEInstallDirs)
INCLUDE(KDECMakeSettings)
INCLUDE(KDECompilerSettings)
-include(ECMInstallIcons)
+INCLUDE(ECMInstallIcons)
INCLUDE(FeatureSummary)
-FIND_PACKAGE(Qt5 5.2 CONFIG REQUIRED COMPONENTS Widgets Xml Network WebKit)
-FIND_PACKAGE(KF5 5.0 REQUIRED COMPONENTS CoreAddons)
+FIND_PACKAGE(Qt5 5.2 CONFIG REQUIRED COMPONENTS Widgets Xml Network WebKit Script)
+FIND_PACKAGE(KF5 5.0 REQUIRED COMPONENTS CoreAddons DocTools I18n XmlGui TextEditor)
IF(FORCE_PRETTY_MAKEFILE)
SET(CMAKE_VERBOSE_MAKEFILE OFF)
diff --git a/doc/rkward/CMakeLists.txt b/doc/rkward/CMakeLists.txt
index 5a2fd50..9a1cd65 100644
--- a/doc/rkward/CMakeLists.txt
+++ b/doc/rkward/CMakeLists.txt
@@ -1,2 +1,2 @@
-KDE4_CREATE_HANDBOOK (index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en)
-KDE4_CREATE_MANPAGE (man-rkward.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
+kdoctools_create_handbook (index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR rkward)
+kdoctools_create_manpage (man-rkward.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
diff --git a/doc/rkwardplugins/CMakeLists.txt b/doc/rkwardplugins/CMakeLists.txt
index 1dc7455..2ba4860 100644
--- a/doc/rkwardplugins/CMakeLists.txt
+++ b/doc/rkwardplugins/CMakeLists.txt
@@ -1,5 +1,6 @@
-# NOTE: KDE4_CREATE_HANDBOOK does not support multiple docbooks inside one directory. That's why this is separate.
-KDE4_CREATE_HANDBOOK (index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en)
+# NOTE: kdoctools_create_handbook does not support multiple docbooks inside one directory. That's why this is separate.
+# KF5 TODO: Is the above still true?
+kdoctools_create_handbook (index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR rkwardplugins)
ADD_CUSTOM_TARGET (webdocs
COMMAND meinproc4 --stylesheet ${DATA_INSTALL_DIR}/ksgmltools2/customization/kde-web.xsl ${CMAKE_CURRENT_SOURCE_DIR}/index.docbook
diff --git a/rkward/CMakeLists.txt b/rkward/CMakeLists.txt
index 4651afd..c3aa15c 100644
--- a/rkward/CMakeLists.txt
+++ b/rkward/CMakeLists.txt
@@ -32,7 +32,7 @@ ENDIF(WIN32)
ADD_SUBDIRECTORY( windows )
ADD_SUBDIRECTORY( syntax )
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${QT_QTWEBKIT_INCLUDE_DIR} ${X11_X11_INCLUDE_PATH} )
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${QT_QTWEBKIT_INCLUDE_DIR} ${X11_X11_INCLUDE_PATH} )
SET(RKWard_Sources
rkward.cpp
@@ -47,7 +47,7 @@ SET(RKWard_Sources
GET_DIRECTORY_PROPERTY(R_SHAREDLIBDIR DIRECTORY rbackend LINK_DIRECTORIES)
LINK_DIRECTORIES(${R_SHAREDLIBDIR})
-KDE4_ADD_EXECUTABLE(rkward.frontend ${RKWard_Sources})
+add_executable(rkward.frontend ${RKWard_Sources})
SET_TARGET_PROPERTIES(rkward.frontend PROPERTIES
MACOSX_BUNDLE_BUNDLE_NAME "RKWard")
@@ -60,7 +60,7 @@ IF(Q_WS_MAC)
@ONLY)
ENDIF(Q_WS_MAC)
-TARGET_LINK_LIBRARIES(rkward.frontend windows ${RKWARD_ADDLIBS} agents dialogs plugin settings dataeditor core scriptbackends rbackend misc KF5::TextEditor ${KDE4_KFILE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KDEWEBKIT_LIBS} Qt5::DBus ${QT_QTSCRIPT_LIBRARY} Qt5::Network ${GETTEXT_LIBRARIES})
+TARGET_LINK_LIBRARIES(rkward.frontend windows ${RKWARD_ADDLIBS} agents dialogs plugin settings dataeditor core scriptbackends rbackend misc KF5::TextEditor ${KDE4_KDEWEBKIT_LIBS} Qt5::DBus Qt5::Script Qt5::Network ${GETTEXT_LIBRARIES})
# wrapper executable
GET_DIRECTORY_PROPERTY(R_EXECUTABLE DIRECTORY rbackend DEFINITION R_EXECUTABLE)
diff --git a/rkward/agents/CMakeLists.txt b/rkward/agents/CMakeLists.txt
index 0c46d57..520355f 100644
--- a/rkward/agents/CMakeLists.txt
+++ b/rkward/agents/CMakeLists.txt
@@ -1,4 +1,4 @@
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
########### next target ###############
diff --git a/rkward/core/CMakeLists.txt b/rkward/core/CMakeLists.txt
index 453f6aa..b63e7c1 100644
--- a/rkward/core/CMakeLists.txt
+++ b/rkward/core/CMakeLists.txt
@@ -1,4 +1,4 @@
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
########### next target ###############
diff --git a/rkward/dataeditor/CMakeLists.txt b/rkward/dataeditor/CMakeLists.txt
index 71bdc2e..9e08f50 100644
--- a/rkward/dataeditor/CMakeLists.txt
+++ b/rkward/dataeditor/CMakeLists.txt
@@ -1,4 +1,4 @@
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
########### next target ###############
diff --git a/rkward/dialogs/CMakeLists.txt b/rkward/dialogs/CMakeLists.txt
index 8ff7533..25dbdfb 100644
--- a/rkward/dialogs/CMakeLists.txt
+++ b/rkward/dialogs/CMakeLists.txt
@@ -1,4 +1,4 @@
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
########### next target ###############
diff --git a/rkward/misc/CMakeLists.txt b/rkward/misc/CMakeLists.txt
index e3223c0..92892b6 100644
--- a/rkward/misc/CMakeLists.txt
+++ b/rkward/misc/CMakeLists.txt
@@ -1,4 +1,4 @@
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
########### next target ###############
diff --git a/rkward/plugin/CMakeLists.txt b/rkward/plugin/CMakeLists.txt
index 829ea21..bf08e70 100644
--- a/rkward/plugin/CMakeLists.txt
+++ b/rkward/plugin/CMakeLists.txt
@@ -1,4 +1,4 @@
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
########### next target ###############
diff --git a/rkward/qwinhost/CMakeLists.txt b/rkward/qwinhost/CMakeLists.txt
index 39e80c1..8ad2d40 100644
--- a/rkward/qwinhost/CMakeLists.txt
+++ b/rkward/qwinhost/CMakeLists.txt
@@ -1,9 +1,9 @@
IF(WIN32)
- INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES})
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
# QT4-automoc does not work, as qwinhost.cpp does not have the #include "qwhinhost.moc"-line.
# We don't want to add it to keep changes small, and use manual moccing, here, instead
- QT4_WRAP_CPP(MANUAL_MOC_CXX qwinhost.h)
+ qt5_wrap_cpp(MANUAL_MOC_CXX qwinhost.h)
SET(qwinhost_STAT_SRCS
qwinhost.cpp
${MANUAL_MOC_CXX}
diff --git a/rkward/rbackend/CMakeLists.txt b/rkward/rbackend/CMakeLists.txt
index c178948..8e90ace 100644
--- a/rkward/rbackend/CMakeLists.txt
+++ b/rkward/rbackend/CMakeLists.txt
@@ -7,7 +7,7 @@ ENDIF(NOT WIN32)
ADD_SUBDIRECTORY( rpackages )
ADD_SUBDIRECTORY( rkwarddevice )
-INCLUDE_DIRECTORIES( ${R_INCLUDEDIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+INCLUDE_DIRECTORIES( ${R_INCLUDEDIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} )
SET (
rbackend_shared_SRCS
diff --git a/rkward/rbackend/rkwarddevice/CMakeLists.txt b/rkward/rbackend/rkwarddevice/CMakeLists.txt
index 8eac6ca..4a92bd4 100644
--- a/rkward/rbackend/rkwarddevice/CMakeLists.txt
+++ b/rkward/rbackend/rkwarddevice/CMakeLists.txt
@@ -1,4 +1,4 @@
-INCLUDE_DIRECTORIES( ${R_INCLUDEDIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+INCLUDE_DIRECTORIES( ${R_INCLUDEDIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} )
SET (
rkgraphicsdevice_backend_SRCS
diff --git a/rkward/rbackend/rpackages/CMakeLists.txt b/rkward/rbackend/rpackages/CMakeLists.txt
index f6e566e..ba0bef6 100644
--- a/rkward/rbackend/rpackages/CMakeLists.txt
+++ b/rkward/rbackend/rpackages/CMakeLists.txt
@@ -1,4 +1,4 @@
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
CONFIGURE_FILE(
"${CMAKE_CURRENT_SOURCE_DIR}/rpackage_install.cmake.in"
diff --git a/rkward/scriptbackends/CMakeLists.txt b/rkward/scriptbackends/CMakeLists.txt
index f750ea9..8e2c47a 100644
--- a/rkward/scriptbackends/CMakeLists.txt
+++ b/rkward/scriptbackends/CMakeLists.txt
@@ -1,4 +1,4 @@
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
########### next target ###############
diff --git a/rkward/settings/CMakeLists.txt b/rkward/settings/CMakeLists.txt
index ebb303d..f187dcc 100644
--- a/rkward/settings/CMakeLists.txt
+++ b/rkward/settings/CMakeLists.txt
@@ -1,4 +1,4 @@
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
########### next target ###############
diff --git a/rkward/windows/CMakeLists.txt b/rkward/windows/CMakeLists.txt
index 688cfd7..98e5543 100644
--- a/rkward/windows/CMakeLists.txt
+++ b/rkward/windows/CMakeLists.txt
@@ -1,4 +1,4 @@
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES})
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
########### next target ###############
More information about the rkward-tracker
mailing list