[Cmake-commits] CMake branch, next, updated. v3.5.1-863-g286b924

[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  286b92460e972aa3be28be15cbb494a345dcaba0 (commit)
       via  e888af97197ab8b14012b6478d570f4e4fd84703 (commit)
      from  f80b1fe6c5c3a6a50166239920a6848877928fad (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=286b92460e972aa3be28be15cbb494a345dcaba0
commit 286b92460e972aa3be28be15cbb494a345dcaba0
Merge: f80b1fe e888af9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 7 10:58:13 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Apr 7 10:58:13 2016 -0400

    Merge topic 'drop-DNDEBUG-space' into next
    
    e888af97 MSVC: Drop space in `/DNDEBUG` flag for consistency (#16052)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e888af97197ab8b14012b6478d570f4e4fd84703
commit e888af97197ab8b14012b6478d570f4e4fd84703
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 7 10:54:06 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 7 10:54:43 2016 -0400

    MSVC: Drop space in `/DNDEBUG` flag for consistency (#16052)
    
    We define `NDEBUG` without a space after the `-D` option for most
    compilers.  Remove the space for MSVC (and Intel Fortran) for
    consistency.  The MS compiler technically does not document that
    the `-D` argument may be separated from its value, though every
    version to date supports it.

diff --git a/Modules/Platform/Windows-Intel-Fortran.cmake b/Modules/Platform/Windows-Intel-Fortran.cmake
index 0f9a10a..1b93db8 100644
--- a/Modules/Platform/Windows-Intel-Fortran.cmake
+++ b/Modules/Platform/Windows-Intel-Fortran.cmake
@@ -6,6 +6,6 @@ set(CMAKE_Fortran_STANDARD_LIBRARIES_INIT "user32.lib")
 __windows_compiler_intel(Fortran)
 set (CMAKE_Fortran_FLAGS_INIT "/W1 /nologo /fpp /libs:dll /threads")
 set (CMAKE_Fortran_FLAGS_DEBUG_INIT "/Od /debug:full /dbglibs")
-set (CMAKE_Fortran_FLAGS_MINSIZEREL_INIT "/O1 /D NDEBUG")
-set (CMAKE_Fortran_FLAGS_RELEASE_INIT "/O2 /D NDEBUG")
-set (CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT "/O2 /debug:full /D NDEBUG")
+set (CMAKE_Fortran_FLAGS_MINSIZEREL_INIT "/O1 /DNDEBUG")
+set (CMAKE_Fortran_FLAGS_RELEASE_INIT "/O2 /DNDEBUG")
+set (CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT "/O2 /debug:full /DNDEBUG")
diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake
index deaa88e..1920a7c 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -303,15 +303,15 @@ macro(__windows_compiler_msvc lang)
     # that include MS's own headers. CMake itself is affected project too.
     set(CMAKE_${lang}_FLAGS_INIT "${_PLATFORM_DEFINES}${_PLATFORM_DEFINES_${lang}} -fms-extensions -fms-compatibility -D_WINDOWS -Wall${_FLAGS_${lang}}")
     set(CMAKE_${lang}_FLAGS_DEBUG_INIT "-D_DEBUG /MDd -gline-tables-only -fno-inline -O0 ${_RTC1}")
-    set(CMAKE_${lang}_FLAGS_RELEASE_INIT "/MD -O2 -D NDEBUG")
-    set(CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT "/MD -gline-tables-only -O2 -fno-inline -D NDEBUG")
-    set(CMAKE_${lang}_FLAGS_MINSIZEREL_INIT "/MD -Os -D NDEBUG")
+    set(CMAKE_${lang}_FLAGS_RELEASE_INIT "/MD -O2 -DNDEBUG")
+    set(CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT "/MD -gline-tables-only -O2 -fno-inline -DNDEBUG")
+    set(CMAKE_${lang}_FLAGS_MINSIZEREL_INIT "/MD -Os -DNDEBUG")
   else()
     set(CMAKE_${lang}_FLAGS_INIT "${_PLATFORM_DEFINES}${_PLATFORM_DEFINES_${lang}} /D_WINDOWS /W3${_FLAGS_${lang}}")
     set(CMAKE_${lang}_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od ${_RTC1}")
-    set(CMAKE_${lang}_FLAGS_RELEASE_INIT "/MD /O2 /Ob2 /D NDEBUG")
-    set(CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT "/MD /Zi /O2 /Ob1 /D NDEBUG")
-    set(CMAKE_${lang}_FLAGS_MINSIZEREL_INIT "/MD /O1 /Ob1 /D NDEBUG")
+    set(CMAKE_${lang}_FLAGS_RELEASE_INIT "/MD /O2 /Ob2 /DNDEBUG")
+    set(CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT "/MD /Zi /O2 /Ob1 /DNDEBUG")
+    set(CMAKE_${lang}_FLAGS_MINSIZEREL_INIT "/MD /O1 /Ob1 /DNDEBUG")
   endif()
   set(CMAKE_${lang}_LINKER_SUPPORTS_PDB ON)
   set(CMAKE_NINJA_DEPTYPE_${lang} msvc)

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

Summary of changes:
 Modules/Platform/Windows-Intel-Fortran.cmake |    6 +++---
 Modules/Platform/Windows-MSVC.cmake          |   12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
CMake