Updater: Fix Tests build (failed with BUILD_UPDATER=NO)

Also don't build the test for the updater, fix missing updater library.

Signed-off-by: Michael Schuster <michael@schuster.ms>

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 343c2352339a3e68bff59dc652049b9c996c001b..a39da386dc433a5c65af90e014de5f1aec69123b 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -15,7 +15,10 @@ include_directories(${CMAKE_SOURCE_DIR}/src
 include(nextcloud_add_test.cmake)
 
 nextcloud_add_test(NextcloudPropagator "")
-nextcloud_add_test(Updater "")
+
+IF(BUILD_UPDATER)
+    nextcloud_add_test(Updater "")
+endif()
 
 SET(FolderWatcher_SRC ../src/gui/folderwatcher.cpp)
 

diff --git a/test/nextcloud_add_test.cmake b/test/nextcloud_add_test.cmake
index 234eb2d7917299724e1f01a24212bb8111aa9e9e..552c2847938be36ca4d682a4d3f40afd328cef41 100644 (file)
--- a/test/nextcloud_add_test.cmake
+++ b/test/nextcloud_add_test.cmake
@@ -9,11 +9,16 @@ macro(nextcloud_add_test test_class additional_cpp)
     set_target_properties(${OWNCLOUD_TEST_CLASS}Test PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY})
 
     target_link_libraries(${OWNCLOUD_TEST_CLASS}Test
-        updater
         ${APPLICATION_EXECUTABLE}sync
         Qt5::Core Qt5::Test Qt5::Xml Qt5::Network Qt5::Qml Qt5::Quick
     )
 
+    IF(BUILD_UPDATER)
+        target_link_libraries(${OWNCLOUD_TEST_CLASS}Test
+            updater
+        )
+    endif()
+
     add_definitions(-DOWNCLOUD_TEST)
     add_definitions(-DOWNCLOUD_BIN_PATH="${CMAKE_BINARY_DIR}/bin")
     add_test(NAME ${OWNCLOUD_TEST_CLASS}Test COMMAND ${OWNCLOUD_TEST_CLASS}Test)
@@ -28,11 +33,16 @@ macro(nextcloud_add_benchmark test_class additional_cpp)
     set_target_properties(${OWNCLOUD_TEST_CLASS}Bench PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY})
 
     target_link_libraries(${OWNCLOUD_TEST_CLASS}Bench
-        updater
         ${APPLICATION_EXECUTABLE}sync
         Qt5::Core Qt5::Test Qt5::Xml Qt5::Network
     )
 
+    IF(BUILD_UPDATER)
+        target_link_libraries(${OWNCLOUD_TEST_CLASS}Bench
+            updater
+        )
+    endif()
+
     add_definitions(-DOWNCLOUD_TEST)
     add_definitions(-DOWNCLOUD_BIN_PATH="${CMAKE_BINARY_DIR}/bin")
 endmacro()