diff options
| author | Brad King <brad.king@kitware.com> | 2015-06-29 14:24:13 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-06-29 14:24:13 (GMT) |
| commit | 1cb8d95509006c6533aaefe5a5ea3fe37692b564 (patch) | |
| tree | 96c02df2c1a7d21875846e81cebdf0315c816be7 /Modules | |
| parent | 7e79931e44c308f3cd25346187eb3b0a2b8b6b24 (diff) | |
| parent | 806609c7024dbf07a639a9d77074d4bc82ae1b8a (diff) | |
| download | CMake-1cb8d95509006c6533aaefe5a5ea3fe37692b564.zip CMake-1cb8d95509006c6533aaefe5a5ea3fe37692b564.tar.gz CMake-1cb8d95509006c6533aaefe5a5ea3fe37692b564.tar.bz2 | |
Merge topic 'vs-librarian-machine-flag-default'
806609c7 VS: Add /machine: flag to Librarian tool (#11240)
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/Platform/Windows-MSVC.cmake | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake index 13fe8bc..2537e39 100644 --- a/Modules/Platform/Windows-MSVC.cmake +++ b/Modules/Platform/Windows-MSVC.cmake @@ -230,6 +230,7 @@ elseif(MSVC_Fortran_ARCHITECTURE_ID) set(_MACHINE_ARCH_FLAG "/machine:${MSVC_Fortran_ARCHITECTURE_ID}") endif() set(CMAKE_EXE_LINKER_FLAGS_INIT "${CMAKE_EXE_LINKER_FLAGS_INIT} ${_MACHINE_ARCH_FLAG}") +set(CMAKE_STATIC_LINKER_FLAGS_INIT "${CMAKE_STATIC_LINKER_FLAGS_INIT} ${_MACHINE_ARCH_FLAG}") unset(_MACHINE_ARCH_FLAG) # add /debug and /INCREMENTAL:YES to DEBUG and RELWITHDEBINFO also add pdbtype |