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 23d26f27542b696654c336adfed2b0981ae991af (commit) via cddcad51020d42bbc321f45507a4649b1842aba4 (commit) from e0201a7acfc4d074b3d41a21f987eaf210984b0d (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=23d26f27542b696654c336adfed2b0981ae991af commit 23d26f27542b696654c336adfed2b0981ae991af Merge: e0201a7 cddcad5 Author: Bill Hoffman <bill.hoff...@kitware.com> AuthorDate: Thu Dec 9 13:40:43 2010 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Thu Dec 9 13:40:43 2010 -0500 Merge topic 'fix_incremental_vs2010' into next cddcad5 Fix incremental linking for VS2010 with nmake or make. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cddcad51020d42bbc321f45507a4649b1842aba4 commit cddcad51020d42bbc321f45507a4649b1842aba4 Author: Bill Hoffman <bill.hoff...@kitware.com> AuthorDate: Thu Dec 9 13:32:48 2010 -0500 Commit: Bill Hoffman <bill.hoff...@kitware.com> CommitDate: Thu Dec 9 13:32:48 2010 -0500 Fix incremental linking for VS2010 with nmake or make. VS2010 deprecated /INCREMENTAL:YES. This change makes /INCREMENTAL the flag to use for incremental linking with VS2010. 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) diff --git a/Source/cmake.cxx b/Source/cmake.cxx index ddfdc24..1b49837 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -3815,6 +3815,10 @@ int cmake::VisualStudioLink(std::vector<std::string>& args, int type) { hasIncremental = true; } + if(cmSystemTools::Strucmp(i->c_str(), "/INCREMENTAL") == 0) + { + hasIncremental = true; + } if(cmSystemTools::Strucmp(i->c_str(), "/MANIFEST:NO") == 0) { hasManifest = false; ----------------------------------------------------------------------- Summary of changes: Modules/Platform/Windows-cl.cmake | 2 ++ Source/cmake.cxx | 4 ++++ 2 files changed, 6 insertions(+), 0 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits