[CMAKE]

[reactos.git] / reactos / cmake / Platform / Windows-cl.cmake

diff --git a/reactos/cmake/Platform/Windows-cl.cmake b/reactos/cmake/Platform/Windows-cl.cmake
index 7e56149..bfdbe20 100644 (file)
--- a/reactos/cmake/Platform/Windows-cl.cmake
+++ b/reactos/cmake/Platform/Windows-cl.cmake
@@ -94,7 +94,7 @@ SET(CMAKE_COMPILE_RESOURCE "rc <FLAGS> /fo<OBJECT> <SOURCE>")
 # that is automatically copied into try_compile directories
 # by the global generator.
 SET(MSVC_IDE 1)
-IF(CMAKE_GENERATOR MATCHES "Makefiles")
+IF(CMAKE_GENERATOR MATCHES "Makefiles" OR CMAKE_GENERATOR MATCHES "Ninja")
   SET(MSVC_IDE 0)
   IF(NOT CMAKE_VC_COMPILER_TESTS_RUN)
     SET(CMAKE_VC_COMPILER_TESTS 1)
@@ -182,20 +182,20 @@ IF(CMAKE_GENERATOR MATCHES "Makefiles")
     ENDIF(CMAKE_COMPILER_RETURN)
     MAKE_DIRECTORY("${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp3")
   ENDIF(NOT CMAKE_VC_COMPILER_TESTS_RUN)
-ENDIF(CMAKE_GENERATOR MATCHES "Makefiles")
+ENDIF(CMAKE_GENERATOR MATCHES "Makefiles" OR CMAKE_GENERATOR MATCHES "Ninja")
 
 IF(MSVC_C_ARCHITECTURE_ID MATCHES 64)
   SET(CMAKE_CL_64 1)
 ELSE(MSVC_C_ARCHITECTURE_ID MATCHES 64)
   SET(CMAKE_CL_64 0)
 ENDIF(MSVC_C_ARCHITECTURE_ID MATCHES 64)
-IF(CMAKE_FORCE_WIN64)
+IF(CMAKE_FORCE_WIN64 OR CMAKE_FORCE_IA64)
   SET(CMAKE_CL_64 1)
-ENDIF(CMAKE_FORCE_WIN64)
+ENDIF(CMAKE_FORCE_WIN64 OR CMAKE_FORCE_IA64)
 
-#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)
@@ -245,10 +245,10 @@ IF(NOT MSVC_INCREMENTAL_DEFAULT)
 ENDIF()
 
 IF (CMAKE_COMPILER_SUPPORTS_PDBTYPE)
-  SET (CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT "/debug /pdbtype:sept")
+  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")
+  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