Fix cmake inclusion of Qml and Quick
authorMax Rees <maxcrees@me.com>
Mon, 24 Feb 2020 05:07:17 +0000 (23:07 -0600)
committerMax Rees <maxcrees@me.com>
Mon, 24 Feb 2020 05:44:54 +0000 (23:44 -0600)
Signed-off-by: Max Rees <maxcrees@me.com>
src/gui/CMakeLists.txt
test/nextcloud_add_test.cmake

index 0e5f04bffdb67faa0b77ee487c936555a6050df2..4061f3745487edc6241b7a8898da738e3e8685f8 100644 (file)
@@ -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} )
index f65687b84c2a598a66ec79b4ecc73f162681907a..234eb2d7917299724e1f01a24212bb8111aa9e9e 100644 (file)
@@ -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)