[ros-diffs] [tfaber] 53433: [CMAKE] - Do not spam MSVC build log with RC/nmake logo

Author: tfaber
Date: Thu Aug 25 07:32:01 2011
New Revision: 53433

URL: http://svn.reactos.org/svn/reactos?rev=53433&view=rev
Log:
[CMAKE]
- Do not spam MSVC build log with RC/nmake logo

Modified:
    trunk/reactos/cmake/CMakeMacros.cmake
    trunk/reactos/cmake/msvc.cmake

Modified: trunk/reactos/cmake/CMakeMacros.cmake
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re…
==============================================================================
--- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original)
+++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Thu Aug 25 07:32:01 2011
@@ -182,7 +182,7 @@
     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}

Modified: trunk/reactos/cmake/msvc.cmake
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=53433…
==============================================================================
--- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original)
+++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Thu Aug 25 07:32:01 2011
@@ -36,7 +36,7 @@
 
 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 @@
         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