[Cmake-commits] CMake branch, next, updated. v3.3.1-2288-g81e1e20

[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  81e1e20c6f12c50c99f0353b50160ec7fe19f261 (commit)
       via  c66835fc37fa3dec32a437010648fee0b210a1a5 (commit)
      from  3b595b4d66009263f1d6bb675f285f4b24508b2e (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=81e1e20c6f12c50c99f0353b50160ec7fe19f261
commit 81e1e20c6f12c50c99f0353b50160ec7fe19f261
Merge: 3b595b4 c66835f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 20 10:48:47 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 20 10:48:47 2015 -0400

    Merge topic 'sublime-msvc-includes' into next
    
    c66835fc Extra Generator: Populate MSVC system include paths from environment (#15597)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c66835fc37fa3dec32a437010648fee0b210a1a5
commit c66835fc37fa3dec32a437010648fee0b210a1a5
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Fri Aug 14 11:38:23 2015 +0200
Commit:     Gregor Jasny <gjasny at googlemail.com>
CommitDate: Tue Aug 18 22:30:55 2015 +0200

    Extra Generator: Populate MSVC system include paths from environment (#15597)

diff --git a/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake b/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake
index 064e650..3bfb876 100644
--- a/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake
+++ b/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake
@@ -101,6 +101,8 @@ if (NOT CMAKE_EXTRA_GENERATOR_C_SYSTEM_INCLUDE_DIRS)
     _DETERMINE_GCC_SYSTEM_INCLUDE_DIRS(c _dirs _defines)
     set(CMAKE_EXTRA_GENERATOR_C_SYSTEM_INCLUDE_DIRS "${_dirs}" CACHE INTERNAL "C compiler system include directories")
     set(CMAKE_EXTRA_GENERATOR_C_SYSTEM_DEFINED_MACROS "${_defines}" CACHE INTERNAL "C compiler system defined macros")
+  elseif ("${CMAKE_C_COMPILER_ID}" MATCHES MSVC)
+    set(CMAKE_EXTRA_GENERATOR_C_SYSTEM_INCLUDE_DIRS "$ENV{INCLUDE}" CACHE INTERNAL "C compiler system include directories")
   endif ()
 endif ()
 
@@ -110,6 +112,8 @@ if (NOT CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_INCLUDE_DIRS)
     _DETERMINE_GCC_SYSTEM_INCLUDE_DIRS(c++ _dirs _defines)
     set(CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_INCLUDE_DIRS "${_dirs}" CACHE INTERNAL "CXX compiler system include directories")
     set(CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_DEFINED_MACROS "${_defines}" CACHE INTERNAL "CXX compiler system defined macros")
+  elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES MSVC)
+    set(CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_INCLUDE_DIRS "$ENV{INCLUDE}" CACHE INTERNAL "CXX compiler system include directories")
   endif ()
 endif ()
 

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

Summary of changes:
 .../CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake |    4 ++++
 1 file changed, 4 insertions(+)


hooks/post-receive
-- 
CMake