[ros-diffs] [akhaldi] 56286: [CMAKE] * Recognize the extra client/server files in add_rpc_files() that Mr. midl generates regardless of the passed flags, and mark them as dummy files so that they don't break t...

akhaldi at svn.reactos.org akhaldi at svn.reactos.org
Sat Mar 31 10:21:19 UTC 2012


Author: akhaldi
Date: Sat Mar 31 10:21:18 2012
New Revision: 56286

URL: http://svn.reactos.org/svn/reactos?rev=56286&view=rev
Log:
[CMAKE]
* Recognize the extra client/server files in add_rpc_files() that Mr. midl generates regardless of the passed flags, and mark them as dummy files so that they don't break the msvc parallel build.

Modified:
    trunk/reactos/cmake/midl-support.cmake

Modified: trunk/reactos/cmake/midl-support.cmake
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/midl-support.cmake?rev=56286&r1=56285&r2=56286&view=diff
==============================================================================
--- trunk/reactos/cmake/midl-support.cmake [iso-8859-1] (original)
+++ trunk/reactos/cmake/midl-support.cmake [iso-8859-1] Sat Mar 31 10:21:18 2012
@@ -57,9 +57,13 @@
     if(_type STREQUAL server)
         set(_server_client /sstub)
         set(_suffix _s)
+        set(_dummy_stub /cstub)
+        set(_dummy_suffix _c)
     elseif(_type STREQUAL client)
         set(_server_client /cstub)
         set(_suffix _c)
+        set(_dummy_stub /sstub)
+        set(_dummy_suffix _s)
     else()
         message(FATAL_ERROR "Please pass either server or client as argument to add_rpc_files")
     endif()
@@ -68,10 +72,11 @@
             set(_idl_file ${CMAKE_CURRENT_SOURCE_DIR}/${_idl_file})
         endif()
         get_filename_component(_name_we ${_idl_file} NAME_WE)
+        set(_dummy_name_we ${_name_we}${_dummy_suffix})
         set(_name_we ${_name_we}${_suffix})
         add_custom_command(
             OUTPUT ${_name_we}.c ${_name_we}.h
-            COMMAND midl ${_includes} ${_defines} ${IDL_FLAGS} /h ${_name_we}.h ${_server_client} ${_name_we}.c ${_idl_file}
+            COMMAND midl ${_includes} ${_defines} ${IDL_FLAGS} /h ${_name_we}.h ${_server_client} ${_name_we}.c ${_dummy_stub} ${_dummy_name_we}.c ${_idl_file}
             DEPENDS ${_idl_file})
     endforeach()
 endfunction()




More information about the Ros-diffs mailing list