[CMAKE]

- Remove /nologo option from RC again - WDK's version doesn't support it
- Add /nologo to MIDL's flags
- Remove redundant IDL compiler declaration for GCC build

svn path=/trunk/; revision=53447

diff --git a/reactos/cmake/gcc.cmake b/reactos/cmake/gcc.cmake
index fd06a5c..a8707d6 100644 (file)
--- a/reactos/cmake/gcc.cmake
+++ b/reactos/cmake/gcc.cmake
@@ -191,15 +191,6 @@ function(set_rc_compiler)
     "<CMAKE_RC_COMPILER> -i <OBJECT> -J res -O coff -o <OBJECT>" PARENT_SCOPE)
 endfunction()
 
-#idl files support
-set(IDL_COMPILER native-widl)
-
-if(ARCH MATCHES i386)
-    set(IDL_FLAGS -m32 --win32)
-elseif(ARCH MATCHES amd64)
-    set(IDL_FLAGS -m64 --win64)
-endif()
-
 function(add_delay_importlibs MODULE)
     foreach(LIB ${ARGN})
         target_link_libraries(${MODULE} ${CMAKE_BINARY_DIR}/importlibs/lib${LIB}_delayed.a)

diff --git a/reactos/cmake/idl-support.cmake b/reactos/cmake/idl-support.cmake
index 07a8458..4e4a24c 100644 (file)
--- a/reactos/cmake/idl-support.cmake
+++ b/reactos/cmake/idl-support.cmake
@@ -10,11 +10,11 @@ if(MSVC)
     set(IDL_PROXY_ARG /proxy)
     set(IDL_INTERFACE_ARG /iid)
     if(ARCH MATCHES i386)
-        set(IDL_FLAGS /win32)
+        set(IDL_FLAGS /nologo /win32)
     elseif(ARCH MATCHES amd64)
-        set(IDL_FLAGS /amd64)
+        set(IDL_FLAGS /nologo /amd64)
     else()
-        set(IDL_FLAGS "")
+        set(IDL_FLAGS /nologo)
     endif()
     set(IDL_DEPENDS "")
 else()

diff --git a/reactos/cmake/msvc.cmake b/reactos/cmake/msvc.cmake
index 851518f..6c2d452 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)
 
-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>")
+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>")
 
 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> /nologo ${rc_result_defs} /I${CMAKE_CURRENT_SOURCE_DIR} ${rc_result_incs} /fo <OBJECT> <SOURCE>" PARENT_SCOPE)
+    set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> ${rc_result_defs} /I${CMAKE_CURRENT_SOURCE_DIR} ${rc_result_incs} /fo <OBJECT> <SOURCE>" PARENT_SCOPE)
 endfunction()
 
 # Thanks MS for creating a stupid linker