[ros-diffs] [akhaldi] 51303: [CMAKE] - Disable incremental linking and edit-and-continue.

[akhaldi]

Author: akhaldi
Date: Sat Apr  9 17:20:36 2011
New Revision: 51303

URL: http://svn.reactos.org/svn/reactos?rev=51303&view=rev
Log:
[CMAKE]
- Disable incremental linking and edit-and-continue.

Modified:
    branches/cmake-bringup/cmake/Platform/Windows-cl.cmake

Modified: branches/cmake-bringup/cmake/Platform/Windows-cl.cmake
URL: 
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/cmake/Platform/Windows-cl.cmake?rev=51303&r1=51302&r2=51303&view=diff
==============================================================================
--- branches/cmake-bringup/cmake/Platform/Windows-cl.cmake [iso-8859-1] 
(original)
+++ branches/cmake-bringup/cmake/Platform/Windows-cl.cmake [iso-8859-1] Sat Apr 
 9 17:20:36 2011
@@ -188,9 +188,9 @@
   SET(CMAKE_CL_64 1)
 ENDIF(CMAKE_FORCE_WIN64)
 
-IF("${MSVC_VERSION}" GREATER 1599)
-  SET(MSVC_INCREMENTAL_DEFAULT ON)
-ENDIF()
+#IF("${MSVC_VERSION}" GREATER 1599)
+#  SET(MSVC_INCREMENTAL_DEFAULT ON)
+#ENDIF()
 
 # No support for old versions
 if(MSVC_VERSION LESS 1310)
@@ -208,8 +208,8 @@
 #SET(CMAKE_C_LINK_EXECUTABLE "<CMAKE_COMMAND> -E vs_link_exe 
${CMAKE_C_LINK_EXECUTABLE}")
 
 SET(CMAKE_BUILD_TYPE_INIT Debug)
-SET(CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /ZI /Ob0 /Od")
-SET(CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /ZI /Ob0 /Od")
+SET(CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /Zi /Ob0 /Od")
+SET(CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /Zi /Ob0 /Od")
 SET(CMAKE_CXX_FLAGS_INIT "/DWIN32 /D_WINDOWS /W3 /Zm1000 /EHsc")
 SET(CMAKE_CXX_FLAGS_MINSIZEREL_INIT "/O1 /Ob1 /D NDEBUG")
 SET(CMAKE_CXX_FLAGS_RELEASE_INIT "/O2 /Ob2 /D NDEBUG")
@@ -240,10 +240,10 @@
 ENDIF()
 
 IF (CMAKE_COMPILER_SUPPORTS_PDBTYPE)
-  SET (CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT "/debug /pdbtype:sept 
${MSVC_INCREMENTAL_YES_FLAG}")
+  SET (CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT "/debug /pdbtype:sept")
   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_DEBUG_INIT "/debug")
   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