[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4129-g7be9c15

[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  7be9c151f56ce2ab4df27f3fbb9332b8c1c55922 (commit)
       via  3cd753dfff880d61f7861f9ecdc2a94b383d18d1 (commit)
      from  027254f8d6c4aa5cb63d044f4ce942dde386e423 (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=7be9c151f56ce2ab4df27f3fbb9332b8c1c55922
commit 7be9c151f56ce2ab4df27f3fbb9332b8c1c55922
Merge: 027254f 3cd753d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 11 14:39:26 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 11 14:39:26 2013 -0400

    Merge topic 'ninja-MSVC-link-executables' into next
    
    3cd753d MSVC: Drop /link from executable link lines with Ninja


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3cd753dfff880d61f7861f9ecdc2a94b383d18d1
commit 3cd753dfff880d61f7861f9ecdc2a94b383d18d1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 11 12:40:44 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 11 14:34:33 2013 -0400

    MSVC: Drop /link from executable link lines with Ninja
    
    In commit fb9f73de (MSVC: Invoke 'link' directly for executables,
    2013-04-08) we forgot to remove the /link option handling added by
    commit e31df039 (Ninja: move <OBJECTS> in front of the first linker
    option, 2012-09-27) to the Platform/Windows-MSVC module.  Drop it now.

diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake
index 685638a..8cb7fd5 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -231,7 +231,6 @@ macro(__windows_compiler_msvc lang)
   set(CMAKE_${lang}_CREATE_ASSEMBLY_SOURCE
     "<CMAKE_${lang}_COMPILER> ${CMAKE_START_TEMP_FILE} ${CMAKE_CL_NOLOGO}${_COMPILE_${lang}} <FLAGS> <DEFINES> /FoNUL /FAs /Fa<ASSEMBLY_SOURCE> /c <SOURCE>${CMAKE_END_TEMP_FILE}")
 
-  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_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}")

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

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


hooks/post-receive
-- 
CMake