Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Müller <fmueller@owncloud.com>2022-01-18 13:13:02 +0300
committerHannah von Reth <vonreth@kde.org>2022-03-14 16:23:05 +0300
commit71fe3f2e1e0f3c1948f8b72b31117cb90631f2db (patch)
treeb6416b2e402d18a014f4b3b0368aec448e56a793 /src/gui/CMakeLists.txt
parent796a57b66332cd1823445cf2f50ea7899c9e7e11 (diff)
Consolidate updater source files handling
An "ocupdater" library would be the preferred solution, but that'd require a major refactoring.
Diffstat (limited to 'src/gui/CMakeLists.txt')
-rw-r--r--src/gui/CMakeLists.txt20
1 files changed, 2 insertions, 18 deletions
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 2ddb35127..d5cb537c4 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -6,8 +6,6 @@ if (WIN32)
find_package(Qt5 REQUIRED COMPONENTS WinExtras)
endif()
-add_subdirectory(updater)
-
set(client_UI_SRCS
aboutdialog.ui
accountsettings.ui
@@ -149,13 +147,6 @@ target_include_directories(owncloudCore PUBLIC
${CMAKE_CURRENT_BINARY_DIR}
)
-
-target_sources(owncloudCore PRIVATE
- updater/ocupdater.cpp
- updater/updateinfo.cpp
- updater/updater.cpp
-)
-
IF( APPLE )
find_package(Qt5 COMPONENTS MacExtras)
target_link_libraries(owncloudCore PUBLIC Qt5::MacExtras)
@@ -166,15 +157,6 @@ IF( APPLE )
settingsdialog_mac.mm
guiutility_mac.mm
folderwatcher_mac.cpp)
-
- if(SPARKLE_FOUND)
- # Define this, we need to check in updater.cpp
- target_compile_definitions(owncloudCore PUBLIC HAVE_SPARKLE)
- target_sources(owncloudCore PRIVATE
- updater/sparkleupdater_mac.mm
- updater/sparkleupdater.h)
- target_link_libraries(owncloudCore PRIVATE ${SPARKLE_LIBRARY})
- endif()
elseif( WIN32 )
target_sources(owncloudCore PRIVATE
platform_win.cpp
@@ -195,6 +177,8 @@ elseif(UNIX AND NOT APPLE )
guiutility_unix.cpp)
endif()
+add_subdirectory(updater)
+
if(WITH_CRASHREPORTER)
target_link_libraries(owncloudCore PUBLIC crashreporter-handler)