diff --git a/NEXTCLOUD.cmake b/NEXTCLOUD.cmake index a2d1fbbfe..4b49a32b3 100644 --- a/NEXTCLOUD.cmake +++ b/NEXTCLOUD.cmake @@ -77,6 +77,6 @@ if(WIN32) option( BUILD_WIN_TOOLS "Build Win32 migration tools" OFF ) endif() -if (APPLE AND (NOT DEFINED CMAKE_OSX_DEPLOYMENT_TARGET OR CMAKE_OSX_DEPLOYMENT_TARGET VERSION_GREATER_EQUAL 11.0)) +if (APPLE AND CMAKE_OSX_DEPLOYMENT_TARGET VERSION_GREATER_EQUAL 11.0) option( BUILD_FILE_PROVIDER_MODULE "Build the macOS virtual files File Provider module" OFF ) endif() diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 162da6e20..6e4acf203 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -285,7 +285,7 @@ IF( APPLE ) list(APPEND client_SRCS cocoainitializer_mac.mm) list(APPEND client_SRCS systray_mac_common.mm) - if (NOT DEFINED CMAKE_OSX_DEPLOYMENT_TARGET OR CMAKE_OSX_DEPLOYMENT_TARGET VERSION_GREATER_EQUAL 10.14) + if (CMAKE_OSX_DEPLOYMENT_TARGET VERSION_GREATER_EQUAL 10.14) list(APPEND client_SRCS systray_mac_usernotifications.mm) endif() @@ -715,7 +715,7 @@ if (APPLE) if (BUILD_FILE_PROVIDER_MODULE) target_link_libraries(nextcloudCore PUBLIC Qt5::MacExtras "-framework UserNotifications -framework FileProvider") - elseif(NOT DEFINED CMAKE_OSX_DEPLOYMENT_TARGET OR CMAKE_OSX_DEPLOYMENT_TARGET VERSION_GREATER_EQUAL 10.14) + elseif(CMAKE_OSX_DEPLOYMENT_TARGET VERSION_GREATER_EQUAL 10.14) target_link_libraries(nextcloudCore PUBLIC Qt5::MacExtras "-framework UserNotifications") else() target_link_libraries(nextcloudCore PUBLIC Qt5::MacExtras)