From f3eed2ad1e7deaa7e984a3d82a8c04fc8595859a Mon Sep 17 00:00:00 2001 From: Felix Weilbach Date: Wed, 14 Apr 2021 09:08:17 +0200 Subject: [PATCH 1/2] Add feature summary to CMake Signed-off-by: Felix Weilbach --- CMakeLists.txt | 6 +++++- cmake/modules/{FindINotify.cmake => FindInotify.cmake} | 0 2 files changed, 5 insertions(+), 1 deletion(-) rename cmake/modules/{FindINotify.cmake => FindInotify.cmake} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index edd14a1dc..61298f9de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,6 +3,8 @@ set(CMAKE_CXX_STANDARD 14) project(client) +include(FeatureSummary) + if(UNIT_TESTING) include(CTest) enable_testing() @@ -188,7 +190,7 @@ if(BUILD_CLIENT) endif() if(UNIX AND NOT APPLE) - find_package(INotify REQUIRED) + find_package(Inotify REQUIRED) endif() find_package(Sphinx) find_package(PdfLatex) @@ -274,3 +276,5 @@ elseif(BUILD_CLIENT) install( FILES sync-exclude.lst DESTINATION ${SYSCONFDIR}/${APPLICATION_SHORTNAME} ) configure_file(sync-exclude.lst bin/sync-exclude.lst COPYONLY) endif() + +feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES INCLUDE_QUIET_PACKAGES) diff --git a/cmake/modules/FindINotify.cmake b/cmake/modules/FindInotify.cmake similarity index 100% rename from cmake/modules/FindINotify.cmake rename to cmake/modules/FindInotify.cmake From 70033cda1f8aa226f4c65cc40bcfb70c30987d65 Mon Sep 17 00:00:00 2001 From: Nicolas Fella Date: Tue, 13 Apr 2021 13:19:40 +0200 Subject: [PATCH 2/2] Use imported target for Threads Signed-off-by: Nicolas Fella --- src/gui/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 6841fd040..468b0b750 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -385,7 +385,7 @@ if(WITH_CRASHREPORTER) if(UNIX AND NOT MAC) find_package(Threads REQUIRED) - target_link_libraries(nextcloudCore PUBLIC ${CMAKE_THREAD_LIBS_INIT}) + target_link_libraries(nextcloudCore PUBLIC Threads::Threads) endif() endif()