Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-06 18:31:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMAKE]

Browse source 
- Do not spam MSVC build log with RC/nmake logo

svn path=/trunk/; revision=53433
This commit is contained in:
Thomas Faber 2011-08-25 07:32:01 +00:00
parent 9688c90346
commit 371eb3f33e
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/cmake/CMakeMacros.cmake
View file

@ -182,7 +182,7 @@ function(add_clean_target target)
if(CMAKE_GENERATOR MATCHES "Unix Makefiles" OR CMAKE_GENERATOR MATCHES "MinGW Makefiles")
set(CLEAN_COMMAND make clean)
elseif(CMAKE_GENERATOR MATCHES "NMake Makefiles")
set(CLEAN_COMMAND nmake clean)
set(CLEAN_COMMAND nmake /nologo clean)
endif()
add_custom_target(${target}_clean
COMMAND ${CLEAN_COMMAND}

4
reactos/cmake/msvc.cmake
View file

@ -36,7 +36,7 @@ endif()
link_directories(${REACTOS_SOURCE_DIR}/importlibs ${REACTOS_BINARY_DIR}/importlibs ${REACTOS_BINARY_DIR}/lib/sdk/crt)
set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <DEFINES> /I${REACTOS_SOURCE_DIR}/include/psdk /I${REACTOS_BINARY_DIR}/include/psdk /I${REACTOS_SOURCE_DIR}/include /I${REACTOS_SOURCE_DIR}/include/reactos /I${REACTOS_BINARY_DIR}/include/reactos /I${REACTOS_SOURCE_DIR}/include/reactos/wine /I${REACTOS_SOURCE_DIR}/include/crt /I${REACTOS_SOURCE_DIR}/include/crt/mingw32 /fo <OBJECT> <SOURCE>")
set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> /nologo <DEFINES> /I${REACTOS_SOURCE_DIR}/include/psdk /I${REACTOS_BINARY_DIR}/include/psdk /I${REACTOS_SOURCE_DIR}/include /I${REACTOS_SOURCE_DIR}/include/reactos /I${REACTOS_BINARY_DIR}/include/reactos /I${REACTOS_SOURCE_DIR}/include/reactos/wine /I${REACTOS_SOURCE_DIR}/include/crt /I${REACTOS_SOURCE_DIR}/include/crt/mingw32 /fo <OBJECT> <SOURCE>")
if(MSVC_IDE)
# Asm source files are not supported in VS generators yet. As a result, <DEFINES> isn't recognized.
@ -143,7 +143,7 @@ function(set_rc_compiler)
set(rc_result_incs "/I${arg} ${rc_result_incs}")
endforeach()
set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> ${rc_result_defs} /I${CMAKE_CURRENT_SOURCE_DIR} ${rc_result_incs} /fo <OBJECT> <SOURCE>" PARENT_SCOPE)
set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> /nologo ${rc_result_defs} /I${CMAKE_CURRENT_SOURCE_DIR} ${rc_result_incs} /fo <OBJECT> <SOURCE>" PARENT_SCOPE)
endfunction()
# Thanks MS for creating a stupid linker