[Cmake-commits] CMake branch, next, updated. v3.1.1-2558-gff75867

[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  ff758672b69e0992e4bf7a7c9d031b3ce4bb5d20 (commit)
       via  467f5bcc6ebb8468bb2ef1fc4edaeab9970a37d4 (commit)
      from  8e8031933929b12fac8b167b542526af045a415a (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=ff758672b69e0992e4bf7a7c9d031b3ce4bb5d20
commit ff758672b69e0992e4bf7a7c9d031b3ce4bb5d20
Merge: 8e80319 467f5bc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 3 13:41:31 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 3 13:41:31 2015 -0500

    Merge topic 'fix-msvc-linker-flags-typo' into next
    
    467f5bcc MSVC: Fix initialization of RelWithDebInfo shared library link flags (#15385)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=467f5bcc6ebb8468bb2ef1fc4edaeab9970a37d4
commit 467f5bcc6ebb8468bb2ef1fc4edaeab9970a37d4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 3 13:36:37 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 3 13:41:21 2015 -0500

    MSVC: Fix initialization of RelWithDebInfo shared library link flags (#15385)
    
    Initialize CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO_INIT from the value
    of CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT rather than the one for
    the DEBUG configuration.  This typo has been present since the logic was
    first added in  commit 36db45082e (ENH: fix up several problems with new
    stuff, 2002-11-11).
    
    Reported-by: Gunnar Roth <gunnar.roth at gmx.de>

diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake
index a72f946..2440f89 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -235,7 +235,7 @@ set(CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT "/INCREMENTAL:NO")
 # shared linker flags
 set (CMAKE_SHARED_LINKER_FLAGS_INIT ${CMAKE_EXE_LINKER_FLAGS_INIT})
 set (CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT ${CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT})
-set (CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO_INIT ${CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT})
+set (CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO_INIT ${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT})
 set (CMAKE_SHARED_LINKER_FLAGS_RELEASE_INIT ${CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT})
 set (CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL_INIT ${CMAKE_EXE_LINKER_FLAGS_MINSIZEREL_INIT})
 # module linker flags
diff --git a/Modules/Platform/Windows-df.cmake b/Modules/Platform/Windows-df.cmake
index 211cc9d..59d88a3 100644
--- a/Modules/Platform/Windows-df.cmake
+++ b/Modules/Platform/Windows-df.cmake
@@ -62,7 +62,7 @@ endif ()
 
 set (CMAKE_SHARED_LINKER_FLAGS_INIT ${CMAKE_EXE_LINKER_FLAGS_INIT})
 set (CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT ${CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT})
-set (CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO_INIT ${CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT})
+set (CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO_INIT ${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT})
 set (CMAKE_MODULE_LINKER_FLAGS_INIT ${CMAKE_SHARED_LINKER_FLAGS_INIT})
 set (CMAKE_MODULE_LINKER_FLAGS_DEBUG_INIT ${CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT})
 set (CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO_INIT ${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT})

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

Summary of changes:
 Modules/Platform/Windows-MSVC.cmake |    2 +-
 Modules/Platform/Windows-df.cmake   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake