[rkward-cvs] [rkward] /: Frontend also requires linking against gettext, now (at least on windows it needs to be direct linking, too).

[Thomas Friedrichsmeier]

Git commit 99d54e85225e046968903aaff7649be142569bb1 by Thomas Friedrichsmeier.
Committed on 22/11/2014 at 12:10.
Pushed by tfry into branch 'master'.

Frontend also requires linking against gettext, now (at least on windows it needs to be direct linking, too).

M  +1    -0    CMakeLists.txt
M  +1    -1    rkward/CMakeLists.txt
M  +0    -1    rkward/rbackend/CMakeLists.txt

http://commits.kde.org/rkward/99d54e85225e046968903aaff7649be142569bb1

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d876912..0df40fd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,6 +8,7 @@ ENDIF(NOT CMAKE_VERBOSE_MAKEFILE)
 
 SET(KDE_MIN_VERSION 3.9.7)	# KDE 4.0rc2
 FIND_PACKAGE(KDE4 REQUIRED)
+FIND_PACKAGE(Gettext REQUIRED)
 
 IF(FORCE_PRETTY_MAKEFILE)
 	SET(CMAKE_VERBOSE_MAKEFILE OFF)
diff --git a/rkward/CMakeLists.txt b/rkward/CMakeLists.txt
index b1a0212..7d69c2e 100644
--- a/rkward/CMakeLists.txt
+++ b/rkward/CMakeLists.txt
@@ -63,7 +63,7 @@ IF(Q_WS_MAC)
 		@ONLY)
 ENDIF(Q_WS_MAC)
 
-TARGET_LINK_LIBRARIES(rkward.frontend ${KDE4_KDECORE_LIBS} windows ${RKWARD_ADDLIBS} agents dialogs plugin settings dataeditor core scriptbackends rbackend misc ${KDE4_KTEXTEDITOR_LIBS} ${KDE4_KHTML_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTDBUS_LIBRARY} ${QT_QTSCRIPT_LIBRARY} ${QT_QTNETWORK_LIBRARY})
+TARGET_LINK_LIBRARIES(rkward.frontend ${KDE4_KDECORE_LIBS} windows ${RKWARD_ADDLIBS} agents dialogs plugin settings dataeditor core scriptbackends rbackend misc ${KDE4_KTEXTEDITOR_LIBS} ${KDE4_KHTML_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTDBUS_LIBRARY} ${QT_QTSCRIPT_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${GETTEXT_LIBRARIES})
 
 # wrapper executable
 GET_DIRECTORY_PROPERTY(R_EXECUTABLE DIRECTORY rbackend DEFINITION R_EXECUTABLE)
diff --git a/rkward/rbackend/CMakeLists.txt b/rkward/rbackend/CMakeLists.txt
index 9a67935..83fec80 100644
--- a/rkward/rbackend/CMakeLists.txt
+++ b/rkward/rbackend/CMakeLists.txt
@@ -58,7 +58,6 @@ QT4_AUTOMOC(${rbackend_BACKEND_SRCS})
 ADD_DEFINITIONS (-DRKWARD_SPLIT_PROCESS)
 LINK_DIRECTORIES(${R_SHAREDLIBDIR})
 ADD_EXECUTABLE(rkward.rbackend ${rbackend_BACKEND_SRCS})
-FIND_PACKAGE(Gettext REQUIRED)
 TARGET_LINK_LIBRARIES(rkward.rbackend rkgraphicsdevice.backend ${R_USED_LIBS} ${CMAKE_THREAD_LIBS_INIT} ${QT_QTNETWORK_LIBRARY} ${QT_QTCORE_LIBRARY} ${GETTEXT_LIBRARIES} )
 
 IF(WIN32)