Author: akhaldi
Date: Tue Oct 4 11:57:31 2011
New Revision: 53986
URL:
http://svn.reactos.org/svn/reactos?rev=53986&view=rev
Log:
[CMAKE]
* Revert r53484 since jom is still buggy (bug reported upstream, to no avail) and as a
result useless for us.
Modified:
trunk/reactos/cmake/Platform/Windows-cl.cmake
Modified: trunk/reactos/cmake/Platform/Windows-cl.cmake
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/Platform/Windows-cl.…
==============================================================================
--- trunk/reactos/cmake/Platform/Windows-cl.cmake [iso-8859-1] (original)
+++ trunk/reactos/cmake/Platform/Windows-cl.cmake [iso-8859-1] Tue Oct 4 11:57:31 2011
@@ -213,8 +213,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 "/Ob0 /Od")
-SET(CMAKE_C_FLAGS_DEBUG_INIT "/Ob0 /Od")
+SET(CMAKE_CXX_FLAGS_DEBUG_INIT "/Zi /Ob0 /Od")
+SET(CMAKE_C_FLAGS_DEBUG_INIT "/Zi /Ob0 /Od")
SET(CMAKE_CXX_FLAGS_INIT "")
SET(CMAKE_CXX_FLAGS_MINSIZEREL_INIT "/O1 /Ob1 /D NDEBUG")
SET(CMAKE_CXX_FLAGS_RELEASE_INIT "/O2 /Ob2 /D NDEBUG")
@@ -244,13 +244,13 @@
SET( MSVC_INCREMENTAL_YES_FLAG "/INCREMENTAL:YES")
ENDIF()
-#IF (CMAKE_COMPILER_SUPPORTS_PDBTYPE)
-# 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)
+IF (CMAKE_COMPILER_SUPPORTS_PDBTYPE)
+ 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")
SET (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT "/debug
${MSVC_INCREMENTAL_YES_FLAG}")
-#ENDIF (CMAKE_COMPILER_SUPPORTS_PDBTYPE)
+ENDIF (CMAKE_COMPILER_SUPPORTS_PDBTYPE)
# for release and minsize release default to no incremental linking
SET(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL_INIT "/INCREMENTAL:NO")
SET(CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT "/INCREMENTAL:NO")