[Cmake-commits] CMake branch, next, updated. v3.5.0-464-g20e46bd

[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  20e46bd88f856b63bb6b88f9a1fad4e8981a64a8 (commit)
       via  6d74e7870b8804a5af0bc395a9fbb45c1b3d26a4 (commit)
       via  1d4ab06a7045edf366c689ba5e29bbc35d08718e (commit)
      from  b2560102bb7999d53577eb34fa9645ac18ec476d (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=20e46bd88f856b63bb6b88f9a1fad4e8981a64a8
commit 20e46bd88f856b63bb6b88f9a1fad4e8981a64a8
Merge: b256010 6d74e78
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 15 10:33:44 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 15 10:33:44 2016 -0400

    Merge topic 'ninja-depfile-system-headers' into next
    
    6d74e787 Ninja: Add dependencies on system-provided header files (#14914)
    1d4ab06a CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6d74e7870b8804a5af0bc395a9fbb45c1b3d26a4
commit 6d74e7870b8804a5af0bc395a9fbb45c1b3d26a4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 15 10:15:53 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 15 10:18:50 2016 -0400

    Ninja: Add dependencies on system-provided header files (#14914)
    
    When system-provided packages are upgraded we must re-compile sources
    depending on their headers.  Use `-MD` instead of `-MMD` so that the
    generated depfiles do not exclude system headers.
    
    Suggested-by: Jussi Judin

diff --git a/Help/release/dev/ninja-depfile-system-headers.rst b/Help/release/dev/ninja-depfile-system-headers.rst
new file mode 100644
index 0000000..7033cef
--- /dev/null
+++ b/Help/release/dev/ninja-depfile-system-headers.rst
@@ -0,0 +1,5 @@
+ninja-depfile-system-headers
+----------------------------
+
+* The :generator:`Ninja` generator now includes system header files in build
+  dependencies to ensure correct re-builds when system packages are updated.
diff --git a/Modules/Compiler/GNU.cmake b/Modules/Compiler/GNU.cmake
index d1ca85e..c2d393d 100644
--- a/Modules/Compiler/GNU.cmake
+++ b/Modules/Compiler/GNU.cmake
@@ -41,7 +41,7 @@ macro(__compiler_gnu lang)
     # distcc does not transform -o to -MT when invoking the preprocessor
     # internally, as it ought to.  Work around this bug by setting -MT here
     # even though it isn't strictly necessary.
-    set(CMAKE_DEPFILE_FLAGS_${lang} "-MMD -MT <OBJECT> -MF <DEPFILE>")
+    set(CMAKE_DEPFILE_FLAGS_${lang} "-MD -MT <OBJECT> -MF <DEPFILE>")
   endif()
 
   # Initial configuration flags.
diff --git a/Modules/Compiler/Intel-C.cmake b/Modules/Compiler/Intel-C.cmake
index dfba4b2..77363eb 100644
--- a/Modules/Compiler/Intel-C.cmake
+++ b/Modules/Compiler/Intel-C.cmake
@@ -6,7 +6,7 @@ set(CMAKE_C_FLAGS_MINSIZEREL_INIT "-Os -DNDEBUG")
 set(CMAKE_C_FLAGS_RELEASE_INIT "-O3 -DNDEBUG")
 set(CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "-O2 -g -DNDEBUG")
 
-set(CMAKE_DEPFILE_FLAGS_C "-MMD -MT <OBJECT> -MF <DEPFILE>")
+set(CMAKE_DEPFILE_FLAGS_C "-MD -MT <OBJECT> -MF <DEPFILE>")
 
 set(CMAKE_C_CREATE_PREPROCESSED_SOURCE "<CMAKE_C_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>")
 set(CMAKE_C_CREATE_ASSEMBLY_SOURCE "<CMAKE_C_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>")
diff --git a/Modules/Compiler/Intel-CXX.cmake b/Modules/Compiler/Intel-CXX.cmake
index 7947695..02c636c 100644
--- a/Modules/Compiler/Intel-CXX.cmake
+++ b/Modules/Compiler/Intel-CXX.cmake
@@ -6,7 +6,7 @@ set(CMAKE_CXX_FLAGS_MINSIZEREL_INIT "-Os -DNDEBUG")
 set(CMAKE_CXX_FLAGS_RELEASE_INIT "-O3 -DNDEBUG")
 set(CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-O2 -g -DNDEBUG")
 
-set(CMAKE_DEPFILE_FLAGS_CXX "-MMD -MT <OBJECT> -MF <DEPFILE>")
+set(CMAKE_DEPFILE_FLAGS_CXX "-MD -MT <OBJECT> -MF <DEPFILE>")
 
 set(CMAKE_CXX_CREATE_PREPROCESSED_SOURCE "<CMAKE_CXX_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>")
 set(CMAKE_CXX_CREATE_ASSEMBLY_SOURCE "<CMAKE_CXX_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>")
diff --git a/Modules/Compiler/QCC.cmake b/Modules/Compiler/QCC.cmake
index 76477e4..f69c7bd 100644
--- a/Modules/Compiler/QCC.cmake
+++ b/Modules/Compiler/QCC.cmake
@@ -20,5 +20,5 @@ macro(__compiler_qcc lang)
   set(CMAKE_${lang}_COMPILE_OPTIONS_TARGET "-V")
 
   set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} "-Wp,-isystem,")
-  set(CMAKE_DEPFILE_FLAGS_${lang} "-Wc,-MMD,<DEPFILE>,-MT,<OBJECT>,-MF,<DEPFILE>")
+  set(CMAKE_DEPFILE_FLAGS_${lang} "-Wc,-MD,<DEPFILE>,-MT,<OBJECT>,-MF,<DEPFILE>")
 endmacro()

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

Summary of changes:
 Help/release/dev/ninja-depfile-system-headers.rst |    5 +++++
 Modules/Compiler/GNU.cmake                        |    2 +-
 Modules/Compiler/Intel-C.cmake                    |    2 +-
 Modules/Compiler/Intel-CXX.cmake                  |    2 +-
 Modules/Compiler/QCC.cmake                        |    2 +-
 Source/CMakeVersion.cmake                         |    2 +-
 6 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 Help/release/dev/ninja-depfile-system-headers.rst


hooks/post-receive
-- 
CMake