kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Code Blocks/Eclipse: Add -std= flag matching. 

When -std=x is specified in CMAKE_CXX_FLAGS this passes it along.
This commit is contained in:
Christian Manning 2014-07-02 21:06:42 +01:00 committed by Brad King
parent 45a25d63ba
commit eaf6f67f67
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake
View File

@ -30,11 +30,14 @@ macro(_DETERMINE_GCC_SYSTEM_INCLUDE_DIRS _lang _resultIncludeDirs _resultDefines
if (CMAKE_CXX_FLAGS MATCHES "(-stdlib=[^ ]+)")
set(_stdlib "${CMAKE_MATCH_1}")
endif ()
if (CMAKE_CXX_FLAGS MATCHES "(-std=[^ ]+)")
set(_stdver "${CMAKE_MATCH_1}")
endif ()
else ()
set(_compilerExecutable "${CMAKE_C_COMPILER}")
set(_arg1 "${CMAKE_C_COMPILER_ARG1}")
endif ()
execute_process(COMMAND ${_compilerExecutable} ${_arg1} ${_stdlib} -v -E -x ${_lang} -dD dummy
execute_process(COMMAND ${_compilerExecutable} ${_arg1} ${_stdver} ${_stdlib} -v -E -x ${_lang} -dD dummy
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/CMakeFiles
ERROR_VARIABLE _gccOutput
OUTPUT_VARIABLE _gccStdout )