[rkward/frameworks] rkward: Remove QT4_AUTOMOC
Thomas Friedrichsmeier
thomas.friedrichsmeier at ruhr-uni-bochum.de
Mon Jun 1 09:26:57 UTC 2015
Git commit 01515c83d8c348a5cdb9784c880c2ee3bfae5b3e by Thomas Friedrichsmeier.
Committed on 01/06/2015 at 09:04.
Pushed by tfry into branch 'frameworks'.
Remove QT4_AUTOMOC
M +0 -3 rkward/CMakeLists.txt
M +0 -2 rkward/agents/CMakeLists.txt
M +0 -2 rkward/core/CMakeLists.txt
M +0 -2 rkward/dataeditor/CMakeLists.txt
M +0 -2 rkward/dialogs/CMakeLists.txt
M +0 -2 rkward/misc/CMakeLists.txt
M +0 -2 rkward/plugin/CMakeLists.txt
M +0 -2 rkward/rbackend/CMakeLists.txt
M +0 -2 rkward/rbackend/rkwarddevice/CMakeLists.txt
M +0 -2 rkward/scriptbackends/CMakeLists.txt
M +0 -2 rkward/settings/CMakeLists.txt
M +0 -2 rkward/windows/CMakeLists.txt
http://commits.kde.org/rkward/01515c83d8c348a5cdb9784c880c2ee3bfae5b3e
diff --git a/rkward/CMakeLists.txt b/rkward/CMakeLists.txt
index 5d270bd..4651afd 100644
--- a/rkward/CMakeLists.txt
+++ b/rkward/CMakeLists.txt
@@ -43,9 +43,6 @@ SET(RKWard_Sources
rkwardapplication.cpp
)
-# auto-gen sources
-#QT4_AUTOMOC(${RKWard_Sources}) # not needed here, as KDE4_ADD_EXECUTABLE mocs the sources in this dir.
-
# 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})
diff --git a/rkward/agents/CMakeLists.txt b/rkward/agents/CMakeLists.txt
index 825cb70..0c46d57 100644
--- a/rkward/agents/CMakeLists.txt
+++ b/rkward/agents/CMakeLists.txt
@@ -13,6 +13,4 @@ SET(agents_STAT_SRCS
showedittextfileagent.cpp
)
-QT4_AUTOMOC(${agents_STAT_SRCS})
-
ADD_LIBRARY(agents STATIC ${agents_STAT_SRCS})
diff --git a/rkward/core/CMakeLists.txt b/rkward/core/CMakeLists.txt
index ec89254..453f6aa 100644
--- a/rkward/core/CMakeLists.txt
+++ b/rkward/core/CMakeLists.txt
@@ -15,8 +15,6 @@ SET(core_STAT_SRCS
rkpseudoobjects.cpp
)
-QT4_AUTOMOC(${core_STAT_SRCS})
-
ADD_LIBRARY(core STATIC ${core_STAT_SRCS})
diff --git a/rkward/dataeditor/CMakeLists.txt b/rkward/dataeditor/CMakeLists.txt
index b029232..71bdc2e 100644
--- a/rkward/dataeditor/CMakeLists.txt
+++ b/rkward/dataeditor/CMakeLists.txt
@@ -12,8 +12,6 @@ SET(dataeditor_STAT_SRCS
rktextmatrix.cpp
)
-QT4_AUTOMOC(${dataeditor_STAT_SRCS})
-
ADD_LIBRARY(dataeditor STATIC ${dataeditor_STAT_SRCS})
diff --git a/rkward/dialogs/CMakeLists.txt b/rkward/dialogs/CMakeLists.txt
index af4c584..8ff7533 100644
--- a/rkward/dialogs/CMakeLists.txt
+++ b/rkward/dialogs/CMakeLists.txt
@@ -13,8 +13,6 @@ SET(dialogs_STAT_SRCS
rkerrordialog.cpp
)
-QT4_AUTOMOC(${dialogs_STAT_SRCS})
-
ADD_LIBRARY(dialogs STATIC ${dialogs_STAT_SRCS})
diff --git a/rkward/misc/CMakeLists.txt b/rkward/misc/CMakeLists.txt
index 285b90b..e3223c0 100644
--- a/rkward/misc/CMakeLists.txt
+++ b/rkward/misc/CMakeLists.txt
@@ -28,8 +28,6 @@ SET(misc_STAT_SRCS
rkfindbar.cpp
)
-QT4_AUTOMOC(${misc_STAT_SRCS})
-
ADD_LIBRARY(misc STATIC ${misc_STAT_SRCS})
diff --git a/rkward/plugin/CMakeLists.txt b/rkward/plugin/CMakeLists.txt
index d3bd8ff..829ea21 100644
--- a/rkward/plugin/CMakeLists.txt
+++ b/rkward/plugin/CMakeLists.txt
@@ -31,8 +31,6 @@ SET(plugin_STAT_SRCS
rkvalueselector.cpp
)
-QT4_AUTOMOC(${plugin_STAT_SRCS})
-
ADD_LIBRARY(plugin STATIC ${plugin_STAT_SRCS})
diff --git a/rkward/rbackend/CMakeLists.txt b/rkward/rbackend/CMakeLists.txt
index fb13b06..c178948 100644
--- a/rkward/rbackend/CMakeLists.txt
+++ b/rkward/rbackend/CMakeLists.txt
@@ -43,7 +43,6 @@ SET (
rkfrontendtransmitter.cpp
rktransmitter.cpp
)
-QT4_AUTOMOC(${rbackend_FRONTEND_SRCS})
ADD_LIBRARY(rbackend STATIC ${rbackend_FRONTEND_SRCS})
TARGET_LINK_LIBRARIES(rbackend rkgraphicsdevice.frontend)
@@ -54,7 +53,6 @@ SET (
rkbackendtransmitter.cpp
rktransmitter.cpp
)
-QT4_AUTOMOC(${rbackend_BACKEND_SRCS})
ADD_DEFINITIONS (-DRKWARD_SPLIT_PROCESS)
LINK_DIRECTORIES(${R_SHAREDLIBDIR})
ADD_EXECUTABLE(rkward.rbackend ${rbackend_BACKEND_SRCS})
diff --git a/rkward/rbackend/rkwarddevice/CMakeLists.txt b/rkward/rbackend/rkwarddevice/CMakeLists.txt
index 2f07647..8eac6ca 100644
--- a/rkward/rbackend/rkwarddevice/CMakeLists.txt
+++ b/rkward/rbackend/rkwarddevice/CMakeLists.txt
@@ -13,8 +13,6 @@ SET (
rkgraphicsdevice.cpp
)
-QT4_AUTOMOC(${rkgraphicsdevice_frontend_SRCS})
ADD_LIBRARY(rkgraphicsdevice.frontend STATIC ${rkgraphicsdevice_frontend_SRCS})
-QT4_AUTOMOC(${rkgraphicsdevice_backend_SRCS})
ADD_LIBRARY(rkgraphicsdevice.backend STATIC ${rkgraphicsdevice_backend_SRCS})
diff --git a/rkward/scriptbackends/CMakeLists.txt b/rkward/scriptbackends/CMakeLists.txt
index c0cd36b..f750ea9 100644
--- a/rkward/scriptbackends/CMakeLists.txt
+++ b/rkward/scriptbackends/CMakeLists.txt
@@ -11,8 +11,6 @@ SET(scriptbackends_STAT_SRCS
rkcomponentscripting.cpp
)
-QT4_AUTOMOC(${scriptbackends_STAT_SRCS})
-
ADD_LIBRARY(scriptbackends STATIC ${scriptbackends_STAT_SRCS})
diff --git a/rkward/settings/CMakeLists.txt b/rkward/settings/CMakeLists.txt
index 8444900..ebb303d 100644
--- a/rkward/settings/CMakeLists.txt
+++ b/rkward/settings/CMakeLists.txt
@@ -18,8 +18,6 @@ SET(settings_STAT_SRCS
rksettingsmoduledebug.cpp
)
-QT4_AUTOMOC(${settings_STAT_SRCS})
-
IF (WIN32 OR USE_BINARY_PACKAGES)
SET_PROPERTY (
SOURCE rksettingsmoduler.cpp
diff --git a/rkward/windows/CMakeLists.txt b/rkward/windows/CMakeLists.txt
index b603fa3..688cfd7 100644
--- a/rkward/windows/CMakeLists.txt
+++ b/rkward/windows/CMakeLists.txt
@@ -23,8 +23,6 @@ SET(windows_STAT_SRCS
rkdebugmessagewindow.cpp
)
-QT4_AUTOMOC(${windows_STAT_SRCS})
-
ADD_LIBRARY(windows STATIC ${windows_STAT_SRCS})
More information about the rkward-tracker
mailing list