[ros-diffs] [akhaldi] 62137: [CMAKE] * Speedup GCC and MSVC builds by making use of the new ninja deps mode. * It will be in effect once you update to RosBE 2.1.1. It's disabled now in the transition phase. CO...

Author: akhaldi
Date: Wed Feb 12 19:36:19 2014
New Revision: 62137

URL: http://svn.reactos.org/svn/reactos?rev=62137&view=rev
Log:
[CMAKE]
* Speedup GCC and MSVC builds by making use of the new ninja deps mode.
* It will be in effect once you update to RosBE 2.1.1. It's disabled now in the transition phase.
CORE-7887

Modified:
    trunk/reactos/CMakeLists.txt
    trunk/reactos/cmake/msvc.cmake

Modified: trunk/reactos/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=62137&am...
==============================================================================
--- trunk/reactos/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/CMakeLists.txt	[iso-8859-1] Wed Feb 12 19:36:19 2014
@@ -26,6 +26,10 @@
 set(CMAKE_COLOR_MAKEFILE OFF)
 #set_property(GLOBAL PROPERTY RULE_MESSAGES OFF)
 set(CMAKE_SKIP_INSTALL_RULES ON)
+
+if(NOT DEFINED CMAKE_DISABLE_NINJA_DEPSLOG)
+    set(CMAKE_DISABLE_NINJA_DEPSLOG TRUE)
+endif()

if(NOT ARCH)
     set(ARCH i386)

Modified: trunk/reactos/cmake/msvc.cmake
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=62137&...
==============================================================================
--- trunk/reactos/cmake/msvc.cmake	[iso-8859-1] (original)
+++ trunk/reactos/cmake/msvc.cmake	[iso-8859-1] Wed Feb 12 19:36:19 2014
@@ -83,13 +83,19 @@
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /MANIFEST:NO /INCREMENTAL:NO /SAFESEH:NO /NODEFAULTLIB /RELEASE")
 set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /MANIFEST:NO /INCREMENTAL:NO /SAFESEH:NO /NODEFAULTLIB /RELEASE")

+if(CMAKE_DISABLE_NINJA_DEPSLOG)
+    set(cl_includes_flag "")
+else()
+    set(cl_includes_flag "/showIncludes")
+endif()
+
 if(MSVC_IDE AND (CMAKE_VERSION MATCHES "ReactOS"))
     # for VS builds we'll only have en-US in resource files
     add_definitions(/DLANGUAGE_EN_US)
 else()
     set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> /nologo <FLAGS> <DEFINES> ${I18N_DEFS} /fo<OBJECT> <SOURCE>")
     set(CMAKE_ASM_COMPILE_OBJECT
-        "cl /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp"
+        "cl ${cl_includes_flag} /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp"
         "<CMAKE_ASM_COMPILER> /nologo /Cp /Fo<OBJECT> /c /Ta <OBJECT>.tmp")
 endif()