Only add to -std option to C++ flags
CMAKE_REQUIRED_FLAGS is intended to be added only to the compile for the next probe, and inside an cmake_push_check_state/cmake_pop_check_state guard. If we add it to the main flags (CMAKE_CXX_FLAGS), it will also be added to subsequent checks, so it suffices.
This commit is contained in:
parent
507c122395
commit
78bb77d863
@ -24,14 +24,12 @@ include(AddOptions)
|
||||
# try to use compiler flag -std=c++11
|
||||
CHECK_CXX_ACCEPTS_FLAG("-std=c++11" CXX_FLAG_CXX11)
|
||||
if(CXX_FLAG_CXX11)
|
||||
add_options (REQUIRED ALL_BUILDS "-std=c++11")
|
||||
add_options (CXX ALL_BUILDS "-std=c++11")
|
||||
set(CXX_STD0X_FLAGS "-std=c++11")
|
||||
else()
|
||||
# try to use compiler flag -std=c++0x for older compilers
|
||||
CHECK_CXX_ACCEPTS_FLAG("-std=c++0x" CXX_FLAG_CXX0X)
|
||||
if(CXX_FLAG_CXX0X)
|
||||
add_options (REQUIRED ALL_BUILDS "-std=c++0x")
|
||||
add_options (CXX ALL_BUILDS "-std=c++0x")
|
||||
set(CXX_STD0X_FLAGS "-std=c++0x")
|
||||
endif(CXX_FLAG_CXX0X)
|
||||
|
Loading…
Reference in New Issue
Block a user