diff options
| author | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2024-03-23 17:16:57 +0100 |
|---|---|---|
| committer | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2024-03-23 17:16:57 +0100 |
| commit | 97d2836f5e72054f640289a93c4f2dd776c4fd00 (patch) | |
| tree | 84f60fb06ef7a03103cf2a1499c5602df88e9655 /CMake | |
| parent | f3640a7312413ef8afc2db1060137a04eea2a016 (diff) | |
macOS: remove deprecated use of property allowedFileTypes in class NSSavePanel
The recommended replacement requires macos ≥ 11.0 and a new framework: UniformTypeIdentifiers
Diffstat (limited to 'CMake')
| -rw-r--r-- | CMake/fl_add_library.cmake | 5 | ||||
| -rw-r--r-- | CMake/setup.cmake | 6 | ||||
| -rw-r--r-- | CMake/variables.cmake | 5 |
3 files changed, 16 insertions, 0 deletions
diff --git a/CMake/fl_add_library.cmake b/CMake/fl_add_library.cmake index d33b4d8ba..3f57e7a3d 100644 --- a/CMake/fl_add_library.cmake +++ b/CMake/fl_add_library.cmake @@ -154,6 +154,11 @@ function(fl_add_library LIBNAME LIBTYPE SOURCES) if(APPLE AND NOT FLTK_BACKEND_X11) target_link_libraries(${TARGET_NAME} PUBLIC "-framework Cocoa") + if(NOT(${CMAKE_SYSTEM_VERSION} VERSION_LESS 20.0.0)) # a.k.a. macOS version ≥ 11.0 + if (NOT (CMAKE_OSX_ARCHITECTURES STREQUAL "ppc" OR CMAKE_OSX_ARCHITECTURES STREQUAL "i386")) + target_link_libraries(${TARGET_NAME} PUBLIC "-framework UniformTypeIdentifiers") + endif() + endif() endif() # we must link fltk with cairo if Cairo or Wayland is enabled (or both) diff --git a/CMake/setup.cmake b/CMake/setup.cmake index b663813be..69835fcb8 100644 --- a/CMake/setup.cmake +++ b/CMake/setup.cmake @@ -126,6 +126,12 @@ if(APPLE) else() set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework Cocoa") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -framework Cocoa") + if(NOT(${CMAKE_SYSTEM_VERSION} VERSION_LESS 20.0.0)) # a.k.a. macOS version ≥ 11.0 + if (NOT (CMAKE_OSX_ARCHITECTURES STREQUAL "ppc" OR CMAKE_OSX_ARCHITECTURES STREQUAL "i386")) + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework UniformTypeIdentifiers") + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -framework UniformTypeIdentifiers") + endif() + endif() endif(FLTK_BACKEND_X11) endif(APPLE) diff --git a/CMake/variables.cmake b/CMake/variables.cmake index 3d37aecad..981cd077c 100644 --- a/CMake/variables.cmake +++ b/CMake/variables.cmake @@ -44,6 +44,11 @@ if(WIN32) list(APPEND FLTK_LDLIBS -lole32 -luuid -lcomctl32 -lws2_32) elseif(APPLE AND NOT FLTK_BACKEND_X11) list(APPEND FLTK_LDLIBS "-framework Cocoa") + if(NOT(${CMAKE_SYSTEM_VERSION} VERSION_LESS 20.0.0)) # a.k.a. macOS version ≥ 11.0 + if (NOT (CMAKE_OSX_ARCHITECTURES STREQUAL "ppc" OR CMAKE_OSX_ARCHITECTURES STREQUAL "i386")) + list(APPEND FLTK_LDLIBS "-framework UniformTypeIdentifiers") + endif() + endif() elseif(FLTK_BACKEND_WAYLAND) list(APPEND FLTK_LDLIBS "-lwayland-cursor -lwayland-client -lxkbcommon -ldbus-1") if(USE_SYSTEM_LIBDECOR) |