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

Amend d954a6b0: use cxx-standard supported by cmake

Browse Source
This commit is contained in:
Kornel Benko 2020-10-22 18:53:53 +02:00
parent d954a6b09c
commit 3999652406
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@ -6,13 +6,11 @@
cmake_minimum_required(VERSION 3.1.0) cmake_minimum_required(VERSION 3.1.0)
set(CMAKE_CXX_STANDARD 20)
set(GNUWIN32_DIR D:/LyX/lyx-unstable/lyx-windows-deps-msvc2017) set(GNUWIN32_DIR D:/LyX/lyx-unstable/lyx-windows-deps-msvc2017)
set(LYX_USE_QT "QT5") set(LYX_USE_QT "QT5")
set(LYX_REQUIRE_SPELLCHECK true) set(LYX_REQUIRE_SPELLCHECK true)
set(LYX_PROJECT LyX) set(LYX_PROJECT LyX)
# Instruct cmake to not use gnu extensions, # Instruct cmake to not use gnu extensions,
# this prevents the mix of '-std=c++*' and '-std=gnu++*' flags # this prevents the mix of '-std=c++*' and '-std=gnu++*' flags
set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_EXTENSIONS OFF)
@ -697,7 +695,17 @@ else()
# 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(CMAKE_CXX_STANDARD ${CMAKE_MATCH_1}) set(std_num ${CMAKE_MATCH_1})
# Try to find a std-cxx-feature supported by this cmake version
while (std_num GREATER 0)
list(FIND CMAKE_CXX_COMPILE_FEATURES "cxx_std_${std_num}" stdfeature)
if (stdfeature GREATER_EQUAL 0)
set(CMAKE_CXX_STANDARD ${std_num})
break()
endif()
math(EXPR std_num "${std_num}-1")
endwhile()
message(STATUS "CMAKE_CXX_STANDARD set to ${CMAKE_CXX_STANDARD}") message(STATUS "CMAKE_CXX_STANDARD set to ${CMAKE_CXX_STANDARD}")
set(LYX_CXX_FLAGS "-Wall -Wunused-parameter ${LYX_CXX_FLAGS}") set(LYX_CXX_FLAGS "-Wall -Wunused-parameter ${LYX_CXX_FLAGS}")
else() else()