[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2728-g860a316

[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  860a316aacb046e4216c41f4d49f986b0ec82892 (commit)
       via  fb9f73de644539b4759ba67041d92fc418db0ee9 (commit)
      from  83ad6f30e91042601c099ade62c8dad6d74d95d4 (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=860a316aacb046e4216c41f4d49f986b0ec82892
commit 860a316aacb046e4216c41f4d49f986b0ec82892
Merge: 83ad6f3 fb9f73d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 8 13:28:13 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Apr 8 13:28:13 2013 -0400

    Merge topic 'vs-no-compiler-pdb-setting' into next
    
    fb9f73d MSVC: Invoke 'link' directly for executables


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fb9f73de644539b4759ba67041d92fc418db0ee9
commit fb9f73de644539b4759ba67041d92fc418db0ee9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 8 12:40:14 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Apr 8 13:03:56 2013 -0400

    MSVC: Invoke 'link' directly for executables
    
    Update the CMAKE_<LANG>_LINK_EXECUTABLE rule variable to invoke the
    linker directly instead of through the compiler.  We already do this
    for DLL linking with CMAKE_<LANG>_CREATE_SHARED_LIBRARY.
    
    This also works around a VS 6 cl bug.  While invoking the link tool
    internally it fails to correctly quote flags like /pdb:... with spaces
    in the value.

diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake
index 28abf05..794bde7 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -237,7 +237,7 @@ macro(__windows_compiler_msvc lang)
   set(CMAKE_${lang}_COMPILER_LINKER_OPTION_FLAG_EXECUTABLE "/link")
   set(CMAKE_${lang}_USE_RESPONSE_FILE_FOR_OBJECTS 1)
   set(CMAKE_${lang}_LINK_EXECUTABLE
-    "${_CMAKE_VS_LINK_EXE}<CMAKE_${lang}_COMPILER> ${CMAKE_CL_NOLOGO} ${CMAKE_START_TEMP_FILE} <FLAGS> /Fe<TARGET> <OBJECTS> /link /implib:<TARGET_IMPLIB> /pdb:<TARGET_PDB> /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR> <CMAKE_${lang}_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>${CMAKE_END_TEMP_FILE}")
+    "${_CMAKE_VS_LINK_EXE}<CMAKE_LINKER> ${CMAKE_CL_NOLOGO} <OBJECTS> ${CMAKE_START_TEMP_FILE} /out:<TARGET> /implib:<TARGET_IMPLIB> /pdb:<TARGET_PDB> /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR> <CMAKE_${lang}_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>${CMAKE_END_TEMP_FILE}")
 
   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}")

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

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


hooks/post-receive
-- 
CMake