anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-19 22:40:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix MSVC C++11 detection

Browse Source 
The old version with empty flag did not enter the loop at all, so we have to
use a workaround. Thanks Uwe for testing.
This commit is contained in:
Georg Baum 2016-07-02 18:26:08 +02:00
parent 5b04b91d54
commit 3c56e7c0eb
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,7 +44,7 @@ else()
# MSVC does not have a general C++11 flag, one can only switch off # MSVC does not have a general C++11 flag, one can only switch off
# MS extensions with /Za in general or by extension with /Zc. # MS extensions with /Za in general or by extension with /Zc.
# Use an empty flag to ensure that CXX11_STD_REGEX is correctly set. # Use an empty flag to ensure that CXX11_STD_REGEX is correctly set.
set(CXX11_FLAG_CANDIDATES "") set(CXX11_FLAG_CANDIDATES "noflagneeded")
else() else()
set(CXX11_FLAG_CANDIDATES set(CXX11_FLAG_CANDIDATES
"--std=c++14" "--std=c++14"
@ -113,7 +113,9 @@ set(SAFE_CMAKE_REQUIRED_QUIET ${CMAKE_REQUIRED_QUIET})
set(CMAKE_REQUIRED_QUIET ON) set(CMAKE_REQUIRED_QUIET ON)
SET(SAFE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}") SET(SAFE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
FOREACH(FLAG ${CXX11_FLAG_CANDIDATES}) FOREACH(FLAG ${CXX11_FLAG_CANDIDATES})
SET(CMAKE_REQUIRED_FLAGS "${FLAG}") IF(NOT "${FLAG}" STREQUAL "noflagneeded")
SET(CMAKE_REQUIRED_FLAGS "${FLAG}")
ENDIF()
UNSET(CXX11_FLAG_DETECTED CACHE) UNSET(CXX11_FLAG_DETECTED CACHE)
CHECK_CXX_SOURCE_COMPILES("${CXX11_TEST_SOURCE}" CXX11_FLAG_DETECTED) CHECK_CXX_SOURCE_COMPILES("${CXX11_TEST_SOURCE}" CXX11_FLAG_DETECTED)
IF(CXX11_FLAG_DETECTED) IF(CXX11_FLAG_DETECTED)
@ -136,5 +138,8 @@ set(CMAKE_REQUIRED_QUIET ${SAFE_CMAKE_REQUIRED_QUIET})
# handle the standard arguments for find_package # handle the standard arguments for find_package
FIND_PACKAGE_HANDLE_STANDARD_ARGS(CXX11Compiler DEFAULT_MSG CXX11_FLAG) FIND_PACKAGE_HANDLE_STANDARD_ARGS(CXX11Compiler DEFAULT_MSG CXX11_FLAG)
IF("${CXX11_FLAG}" STREQUAL "noflagneeded")
SET(CXX11_FLAG "")
ENDIF()
MARK_AS_ADVANCED(CXX11_FLAG CXX11_STD_REGEX) MARK_AS_ADVANCED(CXX11_FLAG CXX11_STD_REGEX)