Author: jgardou
Date: Tue Jun 10 22:15:57 2014
New Revision: 63588
URL: http://svn.reactos.org/svn/reactos?rev=63588&view=rev
Log:
[CMAKE/RPC]
- Disable -Oif flags for generating client/server stubs with widl, except for
advapi32 which needs it
See CORE-8200 for details
Modified:
trunk/reactos/base/services/eventlog/CMakeLists.txt
trunk/reactos/base/system/services/CMakeLists.txt
trunk/reactos/cmake/widl-support.cmake
trunk/reactos/dll/win32/advapi32/CMakeLists.txt
trunk/reactos/dll/win32/lsasrv/CMakeLists.txt
Modified: trunk/reactos/base/services/eventlog/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/CMakeLists.txt?rev=63588&r1=63587&r2=63588&view=diff
==============================================================================
--- trunk/reactos/base/services/eventlog/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/base/services/eventlog/CMakeLists.txt [iso-8859-1] Tue Jun 10
22:15:57 2014
@@ -2,6 +2,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)
Modified: trunk/reactos/base/system/services/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/CMakeLists.txt?rev=63588&r1=63587&r2=63588&view=diff
==============================================================================
--- trunk/reactos/base/system/services/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/base/system/services/CMakeLists.txt [iso-8859-1] Tue Jun 10
22:15:57 2014
@@ -3,6 +3,9 @@
${REACTOS_SOURCE_DIR}/include/reactos/subsys
${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)
Modified: trunk/reactos/cmake/widl-support.cmake
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/widl-support.cmake?rev=63588&r1=63587&r2=63588&view=diff
==============================================================================
--- trunk/reactos/cmake/widl-support.cmake [iso-8859-1] (original)
+++ trunk/reactos/cmake/widl-support.cmake [iso-8859-1] Tue Jun 10
22:15:57 2014
@@ -61,10 +61,10 @@
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")
Modified: trunk/reactos/dll/win32/advapi32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/CMakeLists.txt?rev=63588&r1=63587&r2=63588&view=diff
==============================================================================
--- trunk/reactos/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] Tue Jun 10
22:15:57 2014
@@ -10,6 +10,9 @@
${REACTOS_SOURCE_DIR}/include/reactos/idl
${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
Modified: trunk/reactos/dll/win32/lsasrv/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/CMakeLists.txt?rev=63588&r1=63587&r2=63588&view=diff
==============================================================================
--- trunk/reactos/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] Tue Jun 10
22:15:57 2014
@@ -3,6 +3,9 @@
${CMAKE_CURRENT_BINARY_DIR}
${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)
