Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-23 08:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMAKE]

Browse source 
* 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

svn path=/trunk/; revision=62137
This commit is contained in:
Amine Khaldi 2014-02-12 19:36:19 +00:00
parent f6955a0388
commit e0fbecaa35
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/CMakeLists.txt
View file

@ -27,6 +27,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)
endif()

8
reactos/cmake/msvc.cmake
View file

@ -83,13 +83,19 @@ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO /INCREMENTAL:
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()