mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-25 22:46:04 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into patch-1

Browse source
This commit is contained in:
rakekniven 2021-04-14 17:11:27 +02:00 committed by GitHub
commit 03e7d8da28
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -3,6 +3,8 @@ set(CMAKE_CXX_STANDARD 14)
project(client) project(client)
include(FeatureSummary)
if(UNIT_TESTING) if(UNIT_TESTING)
include(CTest) include(CTest)
enable_testing() enable_testing()
@ -188,7 +190,7 @@ if(BUILD_CLIENT)
endif() endif()
if(UNIX AND NOT APPLE) if(UNIX AND NOT APPLE)
find_package(INotify REQUIRED) find_package(Inotify REQUIRED)
endif() endif()
find_package(Sphinx) find_package(Sphinx)
find_package(PdfLatex) find_package(PdfLatex)
@ -274,3 +276,5 @@ elseif(BUILD_CLIENT)
install( FILES sync-exclude.lst DESTINATION ${SYSCONFDIR}/${APPLICATION_SHORTNAME} ) install( FILES sync-exclude.lst DESTINATION ${SYSCONFDIR}/${APPLICATION_SHORTNAME} )
configure_file(sync-exclude.lst bin/sync-exclude.lst COPYONLY) configure_file(sync-exclude.lst bin/sync-exclude.lst COPYONLY)
endif() endif()
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES INCLUDE_QUIET_PACKAGES)

0
cmake/modules/FindINotify.cmake → cmake/modules/FindInotify.cmake
View file

2
src/gui/CMakeLists.txt
View file

@ -385,7 +385,7 @@ if(WITH_CRASHREPORTER)
if(UNIX AND NOT MAC) if(UNIX AND NOT MAC)
find_package(Threads REQUIRED) find_package(Threads REQUIRED)
target_link_libraries(nextcloudCore PUBLIC ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(nextcloudCore PUBLIC Threads::Threads)
endif() endif()
endif() endif()