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

Merge topic 'extra-generators-std-flags' 

eaf6f67f Code Blocks/Eclipse: Add -std= flag matching.
45a25d63 Code Blocks/Eclipse: Use non-default stdlib includes when specified.
This commit is contained in:
Brad King 2014-11-04 15:09:45 -05:00 committed by CMake Topic Stage
parent 5204329315 eaf6f67f67
commit 190fdec857
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake
View File

@ -26,11 +26,18 @@ macro(_DETERMINE_GCC_SYSTEM_INCLUDE_DIRS _lang _resultIncludeDirs _resultDefines
if (${_lang} STREQUAL "c++") if (${_lang} STREQUAL "c++")
set(_compilerExecutable "${CMAKE_CXX_COMPILER}") set(_compilerExecutable "${CMAKE_CXX_COMPILER}")
set(_arg1 "${CMAKE_CXX_COMPILER_ARG1}") set(_arg1 "${CMAKE_CXX_COMPILER_ARG1}")
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 () else ()
set(_compilerExecutable "${CMAKE_C_COMPILER}") set(_compilerExecutable "${CMAKE_C_COMPILER}")
set(_arg1 "${CMAKE_C_COMPILER_ARG1}") set(_arg1 "${CMAKE_C_COMPILER_ARG1}")
endif () endif ()
execute_process(COMMAND ${_compilerExecutable} ${_arg1} -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 WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/CMakeFiles
ERROR_VARIABLE _gccOutput ERROR_VARIABLE _gccOutput
OUTPUT_VARIABLE _gccStdout ) OUTPUT_VARIABLE _gccStdout )