diff options
| author | Brad King <brad.king@kitware.com> | 2013-09-11 16:40:44 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-09-11 18:34:33 (GMT) |
| commit | 3cd753dfff880d61f7861f9ecdc2a94b383d18d1 (patch) | |
| tree | c1e52e60b29239f9a8be6357c0380ee28ddd9f65 | |
| parent | b2ce2f5e485dddd39f6fda04fbb5110e4e279c1c (diff) | |
| download | CMake-3cd753dfff880d61f7861f9ecdc2a94b383d18d1.zip CMake-3cd753dfff880d61f7861f9ecdc2a94b383d18d1.tar.gz CMake-3cd753dfff880d61f7861f9ecdc2a94b383d18d1.tar.bz2 | |
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.
| -rw-r--r-- | Modules/Platform/Windows-MSVC.cmake | 1 |
1 files changed, 0 insertions, 1 deletions
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}") |