From: Max Rees <maxcrees@me.com>
Date: Mon, 24 Feb 2020 05:07:17 +0000 (-0600)
Subject: Fix cmake inclusion of Qml and Quick
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~222^2^2~347^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3d3021e3b096867e1506127a85ee8089d6d7d9a4;p=nextcloud-desktop.git

Fix cmake inclusion of Qml and Quick

Signed-off-by: Max Rees <maxcrees@me.com>
---

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 0e5f04bff..4061f3745 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -1,5 +1,5 @@
 project(gui)
-find_package(Qt5 REQUIRED COMPONENTS Widgets Svg)
+find_package(Qt5 REQUIRED COMPONENTS Widgets Svg Qml Quick)
 set(CMAKE_AUTOMOC TRUE)
 set(CMAKE_AUTOUIC TRUE)
 set(CMAKE_AUTORCC TRUE)
@@ -308,7 +308,7 @@ set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
 set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
         INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}" )
 
-target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5::Widgets Qt5::Svg Qt5::Network Qt5::Xml)
+target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5::Widgets Qt5::Svg Qt5::Network Qt5::Xml Qt5::Qml Qt5::Quick)
 target_link_libraries( ${APPLICATION_EXECUTABLE} ${synclib_NAME} )
 target_link_libraries( ${APPLICATION_EXECUTABLE} updater )
 target_link_libraries( ${APPLICATION_EXECUTABLE} ${OS_SPECIFIC_LINK_LIBRARIES} )
diff --git a/test/nextcloud_add_test.cmake b/test/nextcloud_add_test.cmake
index f65687b84..234eb2d79 100644
--- a/test/nextcloud_add_test.cmake
+++ b/test/nextcloud_add_test.cmake
@@ -1,4 +1,4 @@
-find_package(Qt5 COMPONENTS Core Test Xml Network REQUIRED)
+find_package(Qt5 COMPONENTS Core Test Xml Network Qml Quick REQUIRED)
 
 macro(nextcloud_add_test test_class additional_cpp)
     set(CMAKE_AUTOMOC TRUE)
@@ -11,7 +11,7 @@ macro(nextcloud_add_test test_class additional_cpp)
     target_link_libraries(${OWNCLOUD_TEST_CLASS}Test
         updater
         ${APPLICATION_EXECUTABLE}sync
-        Qt5::Core Qt5::Test Qt5::Xml Qt5::Network
+        Qt5::Core Qt5::Test Qt5::Xml Qt5::Network Qt5::Qml Qt5::Quick
     )
 
     add_definitions(-DOWNCLOUD_TEST)