diff options
author | Brad King <brad.king@kitware.com> | 2013-09-12 12:46:37 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-09-12 12:46:37 (GMT) |
commit | 11b507438a1a6934a1110369047304f66dd31a49 (patch) | |
tree | 7c6be93dc324be6187fb727f2fc6f65c63610980 | |
parent | 00e44b6f0d2d8af77a7fab75397a748a1799825e (diff) | |
parent | 3cd753dfff880d61f7861f9ecdc2a94b383d18d1 (diff) | |
download | CMake-11b507438a1a6934a1110369047304f66dd31a49.zip CMake-11b507438a1a6934a1110369047304f66dd31a49.tar.gz CMake-11b507438a1a6934a1110369047304f66dd31a49.tar.bz2 |
Merge topic 'ninja-MSVC-link-executables'
3cd753d MSVC: Drop /link from executable link lines with Ninja
-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}") |