[CMAKE/RPC]

 - Disable -Oif flags for generating client/server stubs with widl, except for advapi32 which needs it
See CORE-8200 for details

svn path=/trunk/; revision=63588

diff --git a/reactos/base/services/eventlog/CMakeLists.txt b/reactos/base/services/eventlog/CMakeLists.txt
index 1f799c7..50f0574 100644 (file)
--- a/reactos/base/services/eventlog/CMakeLists.txt
+++ b/reactos/base/services/eventlog/CMakeLists.txt
@@ -3,6 +3,9 @@ include_directories(
     ${REACTOS_SOURCE_DIR}/include/reactos/idl
     ${CMAKE_CURRENT_BINARY_DIR})
 
+# FIXME: See CORE-8200
+set(IDL_FLAGS ${IDL_FLAGS} -Oif)
+
 add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/eventlogrpc.idl)
 
 list(APPEND SOURCE

diff --git a/reactos/base/system/services/CMakeLists.txt b/reactos/base/system/services/CMakeLists.txt
index c3ea514..6d89fb2 100644 (file)
--- a/reactos/base/system/services/CMakeLists.txt
+++ b/reactos/base/system/services/CMakeLists.txt
@@ -4,6 +4,9 @@ include_directories(
     ${REACTOS_SOURCE_DIR}/include/reactos/idl
     ${CMAKE_CURRENT_BINARY_DIR})
 
+# FIXME: See CORE-8200
+set(IDL_FLAGS ${IDL_FLAGS} -Oif)
+
 add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/svcctl.idl)
 
 

diff --git a/reactos/cmake/widl-support.cmake b/reactos/cmake/widl-support.cmake
index 4a93155..71a74b1 100644 (file)
--- a/reactos/cmake/widl-support.cmake
+++ b/reactos/cmake/widl-support.cmake
@@ -61,10 +61,10 @@ function(add_rpc_files __type)
     get_defines(DEFINES)
     # Is it a client or server module?
     if(__type STREQUAL "server")
-        set(__server_client -Oif -s -o)
+        set(__server_client -s -o)
         set(__suffix _s)
     elseif(__type STREQUAL "client")
-        set(__server_client -Oif -c -o)
+        set(__server_client -c -o)
         set(__suffix _c)
     else()
         message(FATAL_ERROR "Please pass either server or client as argument to add_rpc_files")

diff --git a/reactos/dll/win32/advapi32/CMakeLists.txt b/reactos/dll/win32/advapi32/CMakeLists.txt
index 20cbef3..3dbfacb 100644 (file)
--- a/reactos/dll/win32/advapi32/CMakeLists.txt
+++ b/reactos/dll/win32/advapi32/CMakeLists.txt
@@ -11,6 +11,9 @@ include_directories(
     ${REACTOS_SOURCE_DIR}/lib/cryptlib
     ${CMAKE_CURRENT_BINARY_DIR})
 
+# FIXME: See CORE-8200
+set(IDL_FLAGS ${IDL_FLAGS} -Oif)
+
 add_rpc_files(client
     ${REACTOS_SOURCE_DIR}/include/reactos/idl/eventlogrpc.idl
     ${REACTOS_SOURCE_DIR}/include/reactos/idl/lsa.idl

diff --git a/reactos/dll/win32/lsasrv/CMakeLists.txt b/reactos/dll/win32/lsasrv/CMakeLists.txt
index 523841c..02d990d 100644 (file)
--- a/reactos/dll/win32/lsasrv/CMakeLists.txt
+++ b/reactos/dll/win32/lsasrv/CMakeLists.txt
@@ -4,6 +4,9 @@ include_directories(
     ${REACTOS_SOURCE_DIR}/include/reactos/idl
     ${REACTOS_SOURCE_DIR}/include/reactos/subsys/lsass)
 
+# FIXME: See CORE-8200
+set(IDL_FLAGS ${IDL_FLAGS} -Oif)
+
 add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/lsa.idl)
 spec2def(lsasrv.dll lsasrv.spec ADD_IMPORTLIB)