[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-270-g8d71f4b

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  8d71f4b52946e409c18f2a6a05a66baa5160a3a2 (commit)
       via  eaf6f67f67e12c4e137c8e875ac277072bf910b6 (commit)
       via  45a25d63ba738e8b0ce690f8f02469a82815b5f4 (commit)
      from  3b27655763a7a0bf37e0683e93f5ffca279eaceb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8d71f4b52946e409c18f2a6a05a66baa5160a3a2
commit 8d71f4b52946e409c18f2a6a05a66baa5160a3a2
Merge: 3b27655 eaf6f67
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 3 09:20:43 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 3 09:20:43 2014 -0500

    Merge topic 'extra-generators-std-flags' into next
    
    eaf6f67f Code Blocks/Eclipse: Add -std= flag matching.
    45a25d63 Code Blocks/Eclipse: Use non-default stdlib includes when specified.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eaf6f67f67e12c4e137c8e875ac277072bf910b6
commit eaf6f67f67e12c4e137c8e875ac277072bf910b6
Author:     Christian Manning <cmanning999 at gmail.com>
AuthorDate: Wed Jul 2 21:06:42 2014 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 3 09:19:18 2014 -0500

    Code Blocks/Eclipse: Add -std= flag matching.
    
    When -std=x is specified in CMAKE_CXX_FLAGS this passes it along.

diff --git a/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake b/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake
index 0eacbba..064e650 100644
--- a/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake
+++ b/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake
@@ -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 )

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=45a25d63ba738e8b0ce690f8f02469a82815b5f4
commit 45a25d63ba738e8b0ce690f8f02469a82815b5f4
Author:     Christian Manning <cmanning999 at gmail.com>
AuthorDate: Wed Jul 2 16:15:28 2014 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 3 09:18:44 2014 -0500

    Code Blocks/Eclipse: Use non-default stdlib includes when specified.
    
    When -stdlib=x is specified in CMAKE_CXX_FLAGS this passes it along so
    that the correct include dirs are detected.

diff --git a/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake b/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake
index 92b0d1d..0eacbba 100644
--- a/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake
+++ b/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake
@@ -26,11 +26,15 @@ macro(_DETERMINE_GCC_SYSTEM_INCLUDE_DIRS _lang _resultIncludeDirs _resultDefines
   if (${_lang} STREQUAL "c++")
     set(_compilerExecutable "${CMAKE_CXX_COMPILER}")
     set(_arg1 "${CMAKE_CXX_COMPILER_ARG1}")
+
+    if (CMAKE_CXX_FLAGS MATCHES "(-stdlib=[^ ]+)")
+      set(_stdlib "${CMAKE_MATCH_1}")
+    endif ()
   else ()
     set(_compilerExecutable "${CMAKE_C_COMPILER}")
     set(_arg1 "${CMAKE_C_COMPILER_ARG1}")
   endif ()
-  execute_process(COMMAND ${_compilerExecutable} ${_arg1} -v -E -x ${_lang} -dD dummy
+  execute_process(COMMAND ${_compilerExecutable} ${_arg1} ${_stdlib} -v -E -x ${_lang} -dD dummy
                   WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/CMakeFiles
                   ERROR_VARIABLE _gccOutput
                   OUTPUT_VARIABLE _gccStdout )

-----------------------------------------------------------------------

Summary of changes:
 ...eExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake