[Cmake-commits] [cmake-commits] hoffman committed Windows-cl.cmake 1.90 1.91

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules/Platform
In directory public:/mounts/ram/cvs-serv27685/Modules/Platform

Modified Files:
	Windows-cl.cmake 
Log Message:
ENH: do not use  /INCREMENTAL:YES with VS 10 compiler


Index: Windows-cl.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Windows-cl.cmake,v
retrieving revision 1.90
retrieving revision 1.91
diff -C 2 -d -r1.90 -r1.91
*** Windows-cl.cmake	14 Oct 2008 20:07:11 -0000	1.90
--- Windows-cl.cmake	15 Jul 2009 16:18:37 -0000	1.91
***************
*** 104,107 ****
--- 104,110 ----
          SET(MSVC80 0)
        ENDIF("${compilerVersion}" GREATER 1500)
+       IF("${compilerVersion}" EQUAL 1600)
+         SET(MSVC10 1)
+       ENDIF()
        SET(MSVC_VERSION "${compilerVersion}")
      ELSE(NOT CMAKE_COMPILER_RETURN)
***************
*** 169,172 ****
--- 172,178 ----
  ENDIF(CMAKE_FORCE_WIN64)
  
+ IF("${MSVC_VERSION}" GREATER 1599)
+   SET(MSVC_INCREMENTAL_DEFAULT ON)
+ ENDIF()
  
  # default to Debug builds
***************
*** 240,249 ****
  # add /debug and /INCREMENTAL:YES to DEBUG and RELWITHDEBINFO also add pdbtyp
  # on versions that support it
  IF (CMAKE_COMPILER_SUPPORTS_PDBTYPE)
!   SET (CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT "/debug /pdbtype:sept /INCREMENTAL:YES")
!   SET (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT "/debug /pdbtype:sept /INCREMENTAL:YES")
  ELSE (CMAKE_COMPILER_SUPPORTS_PDBTYPE)
!   SET (CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT "/debug /INCREMENTAL:YES")
!   SET (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT "/debug /INCREMENTAL:YES")
  ENDIF (CMAKE_COMPILER_SUPPORTS_PDBTYPE)
  # for release and minsize release default to no incremental linking
--- 246,261 ----
  # add /debug and /INCREMENTAL:YES to DEBUG and RELWITHDEBINFO also add pdbtyp
  # on versions that support it
+ SET( MSVC_INCREMENTAL_YES_FLAG "")
+ IF(NOT MSVC_INCREMENTAL_DEFAULT)
+   SET( MSVC_INCREMENTAL_YES_FLAG "/INCREMENTAL:YES")
+ ENDIF()
+ message("MSVC_INCREMENTAL_YES_FLAG = ${MSVC_INCREMENTAL_YES_FLAG}")
+ 
  IF (CMAKE_COMPILER_SUPPORTS_PDBTYPE)
!   SET (CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT "/debug /pdbtype:sept ${MSVC_INCREMENTAL_YES_FLAG}")
!   SET (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT "/debug /pdbtype:sept ${MSVC_INCREMENTAL_YES_FLAG}")
  ELSE (CMAKE_COMPILER_SUPPORTS_PDBTYPE)
!   SET (CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT "/debug ${MSVC_INCREMENTAL_YES_FLAG}")
!   SET (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT "/debug ${MSVC_INCREMENTAL_YES_FLAG}")
  ENDIF (CMAKE_COMPILER_SUPPORTS_PDBTYPE)
  # for release and minsize release default to no incremental linking