anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-27 11:52:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cmake build: disable warning deprecated-copy when supported

Browse Source
This commit is contained in:
Kornel Benko 2021-10-16 11:23:34 +02:00
parent 1922ee7d40
commit 7572771c0f
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
CMakeLists.txt
View File

@ -634,14 +634,29 @@ if(NOT MSVC)
if(NOT LYX_QUIET) if(NOT LYX_QUIET)
set(CMAKE_VERBOSE_MAKEFILE ON) set(CMAKE_VERBOSE_MAKEFILE ON)
endif() endif()
set(LYX_CXX_FLAGS "-Wall -Wunused-parameter ${LYX_GCC11_MODE}") if(LYX_GCC11_MODE MATCHES "\\+\\+([0-9][0-9])")
if(LYX_CXX_FLAGS MATCHES "\\+\\+(14|11|98)")
# Thanks to Brad King <brad.king@kitware.com> # Thanks to Brad King <brad.king@kitware.com>
# for the pointer to https://cmake.org/cmake/help/v3.6/variable/CMAKE_CXX_STANDARD.html # for the pointer to https://cmake.org/cmake/help/v3.6/variable/CMAKE_CXX_STANDARD.html
# This allows us to use QT5.7 with recent g++ (version >= 4.9) compilers # This allows us to use QT5.7 with recent g++ (version >= 4.9) compilers
# and still use our own c++ extension tests # and still use our own c++ extension tests
set(std_num ${CMAKE_MATCH_1})
set(CMAKE_CXX_STANDARD ${CMAKE_MATCH_1}) set(CMAKE_CXX_STANDARD ${CMAKE_MATCH_1})
message(STATUS "CMAKE_CXX_STANDARD set to ${CMAKE_CXX_STANDARD}") message(STATUS "CMAKE_CXX_STANDARD set to ${CMAKE_CXX_STANDARD}")
else()
message(STATUS "Setting CMAKE_CXX_STANDARD 11 as fallback")
set(CMAKE_CXX_STANDARD 11)
set(LYX_GCC11_MODE "--std=c++11")
endif()
# 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)
include(CheckCXXCompilerFlag)
unset(CHECK_WNODEPRECATEDCOPY_FLAG CACHE)
CHECK_CXX_COMPILER_FLAG("-Wdeprecated-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() endif()
if(LYX_STDLIB_DEBUG) if(LYX_STDLIB_DEBUG)
set(LYX_CXX_FLAGS "${LYX_CXX_FLAGS} -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC") set(LYX_CXX_FLAGS "${LYX_CXX_FLAGS} -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC")