Replace deprecated slot

[features.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 12dd3947be334043ffcb2ebfd6dfa35532039add..c3eed1a52d4a0d39719ae4f385b508e36ed50d41 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -699,7 +699,14 @@ else()
        # The following setting with LYX_GCC11_MODE is needed because cmake does not honor
        # CMAKE_CXX_STANDARD while performing tests like
        # check_cxx_source_compiles("..." HAVE_DEF_MAKE_UNIQUE)
-       set(LYX_CXX_FLAGS "-Wall -Wextra -Wno-deprecated-copy ${LYX_GCC11_MODE}${LYX_CXX_FLAGS}")
+       include(CheckCXXCompilerFlag)
+       unset(CHECK_WNODEPRECATEDCOPY_FLAG CACHE)
+       CHECK_CXX_COMPILER_FLAG("-Wno-deprecated-copy" CHECK_WNODEPRECATEDCOPY_FLAG)
+       if(${CHECK_WNODEPRECATEDCOPY_FLAG})
+               set(LYX_CXX_FLAGS "-Wall -Wextra -Wno-deprecated-copy ${LYX_GCC11_MODE}${LYX_CXX_FLAGS}")
+       else()
+               set(LYX_CXX_FLAGS "-Wall -Wextra ${LYX_GCC11_MODE}${LYX_CXX_FLAGS}")
+       endif()
        if(LYX_STDLIB_DEBUG)
          set(LYX_CXX_FLAGS "${LYX_CXX_FLAGS} -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC")
         else()
@@ -790,7 +797,11 @@ if(LYX_USE_QT MATCHES "QT6|QT5")
        if (${QtVal}Core_FOUND)
                find_package(${QtVal}Widgets CONFIG REQUIRED)
                if(APPLE)
-                       find_package(${QtVal}MacExtras CONFIG REQUIRED)
+                       if (LYX_USE_QT MATCHES "QT6")
+                               find_package(${QtVal}MacExtras CONFIG QUIET)
+                       else()
+                               find_package(${QtVal}MacExtras CONFIG REQUIRED)
+                       endif()
                endif()
                find_package(${QtVal}X11Extras CONFIG QUIET)
                find_package(${QtVal}WinExtras CONFIG QUIET)