boost, cmake: Turn off warning that signals are deprecated

[features.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 03b957d6a87bb751c4c55dd2c46ced8507574b31..8ab1bea25829a72c3d5e9239fb9492a88a60ea2a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -204,8 +204,7 @@ else()
 endif()
 
 
-# Variable that hold the flags that should only be used with C++ files
-set(LYX_CXX_SPECIFIC_FLAGS)
+set(LYX_GCC11_MODE)
 if(UNIX OR MINGW)
        execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
        message(STATUS "Using GCC version ${GCC_VERSION}")
@@ -220,7 +219,7 @@ if(UNIX OR MINGW)
                if(NOT CXX11COMPILER_FOUND)
                        message(FATAL_ERROR "A C++11 compatible compiler is required.")
                endif()
-               set(LYX_CXX_SPECIFIC_FLAGS "${LYX_CXX_SPECIFIC_FLAGS} ${CXX11_FLAG}")
+               set(LYX_GCC11_MODE "${CXX11_FLAG}")
        endif()
 else()
        if(MSVC10)
@@ -484,7 +483,7 @@ if(NOT MSVC)
        if(NOT LYX_QUIET)
                set(CMAKE_VERBOSE_MAKEFILE ON)
        endif()
-       set(LYX_CXX_FLAGS "-Wall -Wunused-parameter")
+       set(LYX_CXX_FLAGS "-Wall -Wunused-parameter ${LYX_GCC11_MODE}")
        if(LYX_STDLIB_DEBUG)
                set(LYX_CXX_FLAGS "${LYX_CXX_FLAGS} -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC")
        endif()
@@ -591,6 +590,7 @@ else()
                set(Lyx_Boost_Libraries boost_signals boost_regex)
        endif()
        add_definitions(-DBOOST_USER_CONFIG="<config.h>")
+       add_definitions(-DBOOST_SIGNALS_NO_DEPRECATION_WARNING=1)
        include_directories(${TOP_SRC_DIR}/boost)
        add_subdirectory(boost "${TOP_BINARY_DIR}/boost")
 endif()