From e78e58a7deb7356e0099c47d0b1cd5cf953e7d09 Mon Sep 17 00:00:00 2001
From: Kornel Benko <kornel@lyx.org>
Date: Mon, 12 Sep 2016 11:04:14 +0200
Subject: [PATCH] Cmake build: Shuffle code around.

---
 CMakeLists.txt     | 3 ++-
 src/CMakeLists.txt | 3 ---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8479c8984b..933a8f3845 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -651,8 +651,9 @@ elseif(LYX_USE_QT MATCHES "QT4")
 	macro (qt_wrap_uifiles)
 		qt4_wrap_ui(${ARGN})
 	endmacro()
+        set(LYX_QTMAIN_LIBRARY ${QT_QTSVG_LIBRARY})
 	if(WIN32)
-		set(LYX_QTMAIN_LIBRARY ${QT_QTMAIN_LIBRARIES})
+		list(APPEND LYX_QTMAIN_LIBRARY ${QT_QTMAIN_LIBRARIES})
 	endif()
 else()
   message(FATAL_ERROR "Unhandled value for LYX_USE_QT (${LYX_USE_QT})")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b7d1b06791..0c56ce62e4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -132,9 +132,6 @@ target_link_libraries(${_lyx}
 	${LYX_QTMAIN_LIBRARY}
 	${vld_dll})
 
-if(LYX_USE_QT MATCHES "QT4")
-  target_link_libraries(${_lyx} ${QT_QTSVG_LIBRARY})
-endif()
 qt_use_modules(${_lyx} Core Gui)
 
 if(QT_USES_X11)