[ros-diffs] [tkreuzer] 49856: [CMAKE] Make rpcproxy macro portable

Author: tkreuzer
Date: Sun Nov 28 20:16:40 2010
New Revision: 49856

URL: http://svn.reactos.org/svn/reactos?rev=49856&view=rev
Log:
[CMAKE]
Make rpcproxy macro portable

Modified:
    branches/cmake-bringup/CMakeMacros.cmake
    branches/cmake-bringup/gcc.cmake
    branches/cmake-bringup/msc.cmake

Modified: branches/cmake-bringup/CMakeMacros.cmake
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeMacros.cmake…
==============================================================================
--- branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] (original)
+++ branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] Sun Nov 28 20:16:40 2010
@@ -172,8 +172,8 @@
         get_filename_component(FILE ${_in_FILE} NAME_WE)
         add_custom_command(
             OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.h
${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c
-            COMMAND native-widl ${result_incs} ${result_defs} -m32 --win32 -h -H
${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.h -p -P ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c
${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl
-            DEPENDS native-widl)
+            COMMAND ${IDL_COMPILER} ${result_incs} ${result_defs} ${IDL_FLAGS}
${IDL_HEADER_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.h ${IDL_PROXY_ARG}
${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl
+            DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl)
         set_source_files_properties(
             ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h
${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c
             PROPERTIES GENERATED TRUE)
@@ -184,17 +184,17 @@
             DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c)
         #add_dependencies(${TARGET}_proxy ${TARGET}_${FILE}_p)
     endforeach(_in_FILE ${ARGN})
-    
-    	add_custom_command(
-    	    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c
-    	    COMMAND native-widl ${result_incs} ${result_defs}  -m32 --win32 --dlldata-only
--dlldata=${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c ${IDLS}
-    	    DEPENDS native-widl)
-    	set_source_files_properties(
-    	    ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c
-    	    PROPERTIES GENERATED TRUE)
-        
-        add_library(${TARGET}_proxy ${SOURCE})
-        add_dependencies(${TARGET}_proxy psdk ${PROXY_DEPENDS})
+
+    add_custom_command(
+        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c
+        COMMAND ${IDL_COMPILER} ${result_incs} ${result_defs} ${IDL_FLAGS}
${IDL_DLLDATA_ARG}${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c ${IDLS}
+        DEPENDS ${IDLS})
+    set_source_files_properties(
+        ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c
+        PROPERTIES GENERATED TRUE)
+    
+    add_library(${TARGET}_proxy ${SOURCE})
+    add_dependencies(${TARGET}_proxy psdk ${PROXY_DEPENDS})
 endmacro(rpcproxy)
 
 macro (MACRO_IDL_FILES)

Modified: branches/cmake-bringup/gcc.cmake
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=498…
==============================================================================
--- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original)
+++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Sun Nov 28 20:16:40 2010
@@ -190,6 +190,8 @@
 set(IDL_TYPELIB_ARG -t -T) #.tlb
 set(IDL_SERVER_ARG -s -S) #.c for server library
 set(IDL_CLIENT_ARG -c -C) #.c for stub client library
+set(IDL_PROXY_ARG -p -P)
+set(IDL_DLLDATA_ARG --dlldata-only --dlldata=)
 
 macro(add_importlib_target _def_file)
   # empty for now, while import libs are shipped

Modified: branches/cmake-bringup/msc.cmake
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=498…
==============================================================================
--- branches/cmake-bringup/msc.cmake [iso-8859-1] (original)
+++ branches/cmake-bringup/msc.cmake [iso-8859-1] Sun Nov 28 20:16:40 2010
@@ -136,6 +136,8 @@
 set(IDL_TYPELIB_ARG /tlb) #.tlb
 set(IDL_SERVER_ARG /sstub) #.c for stub server library
 set(IDL_CLIENT_ARG /cstub) #.c for stub client library
+set(IDL_PROXY_ARG /proxy)
+set(IDL_DLLDATA_ARG /dlldata )
 
 # Thanks MS for creating a stupid linker
 macro(add_importlib_target _spec_file)