diff options
| author | Brad King <brad.king@kitware.com> | 2010-12-14 19:38:27 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2010-12-14 19:38:27 (GMT) |
| commit | 5bea0917ef53ccb3eb5cca40b3900668161cf5e7 (patch) | |
| tree | f553f81cdfe98e4a1e87d9b18bd19119f1f933e2 /Modules | |
| parent | b3f2d19ba763401f7c940d9c9f289d5d74422fe1 (diff) | |
| parent | cddcad51020d42bbc321f45507a4649b1842aba4 (diff) | |
| download | CMake-5bea0917ef53ccb3eb5cca40b3900668161cf5e7.zip CMake-5bea0917ef53ccb3eb5cca40b3900668161cf5e7.tar.gz CMake-5bea0917ef53ccb3eb5cca40b3900668161cf5e7.tar.bz2 | |
Merge topic 'fix_incremental_vs2010'
cddcad5 Fix incremental linking for VS2010 with nmake or make.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/Platform/Windows-cl.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Modules/Platform/Windows-cl.cmake b/Modules/Platform/Windows-cl.cmake index 7463c62..56582ff 100644 --- a/Modules/Platform/Windows-cl.cmake +++ b/Modules/Platform/Windows-cl.cmake @@ -212,6 +212,8 @@ SET (CMAKE_EXE_LINKER_FLAGS_INIT SET( MSVC_INCREMENTAL_YES_FLAG "") IF(NOT MSVC_INCREMENTAL_DEFAULT) SET( MSVC_INCREMENTAL_YES_FLAG "/INCREMENTAL:YES") +ELSE() + SET( MSVC_INCREMENTAL_YES_FLAG "/INCREMENTAL" ) ENDIF() IF (CMAKE_COMPILER_SUPPORTS_PDBTYPE) |