[CMAKE]

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

svn path=/trunk/; revision=53433

diff --git a/reactos/cmake/CMakeMacros.cmake b/reactos/cmake/CMakeMacros.cmake
index 9645f4f..3a82350 100644 (file)
--- a/reactos/cmake/CMakeMacros.cmake
+++ b/reactos/cmake/CMakeMacros.cmake
@@ -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")
     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}
     endif()
     add_custom_target(${target}_clean
         COMMAND ${CLEAN_COMMAND}

diff --git a/reactos/cmake/msvc.cmake b/reactos/cmake/msvc.cmake
index 6c2d452..851518f 100644 (file)
--- a/reactos/cmake/msvc.cmake
+++ b/reactos/cmake/msvc.cmake
@@ -36,7 +36,7 @@ endif()
 
 link_directories(${REACTOS_SOURCE_DIR}/importlibs ${REACTOS_BINARY_DIR}/importlibs ${REACTOS_BINARY_DIR}/lib/sdk/crt)
 
 
 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.
 
 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(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
 endfunction()
 
 # Thanks MS for creating a stupid linker