anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 05:16:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not use --std=c++14 for MSVC

Browse Source 
MSVC does not need a special flag to specify the standard. Using --std=c++14
produces a warning, but compilation succeeds, so the old code did mistakenly
choose --std=c++14 for MSVC.
This commit is contained in:
Georg Baum 2016-07-02 12:42:04 +02:00
parent e49d59dafc
commit 987dd84461
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
development/cmake/modules/FindCXX11Compiler.cmake
View File

@ -40,12 +40,19 @@ else()
if (CYGWIN) if (CYGWIN)
set(CXX11_FLAG_CANDIDATES "--std=gnu++11") set(CXX11_FLAG_CANDIDATES "--std=gnu++11")
else() else()
set(CXX11_FLAG_CANDIDATES if (MSVC)
"--std=c++14" # MSVC does not have a general C++11 flag, one can only switch off
"--std=c++11" # MS extensions with /Za in general or by extension with /Zc.
"--std=gnu++11" # Use an empty flag to ensure that CXX11_STD_REGEX is correctly set.
"--std=gnu++0x" set(CXX11_FLAG_CANDIDATES "")
) else()
set(CXX11_FLAG_CANDIDATES
"--std=c++14"
"--std=c++11"
"--std=gnu++11"
"--std=gnu++0x"
)
endif()
endif() endif()
endif() endif()