From e1149127bf4e0560000cd0c8649d5296c1cec3db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gardou?= Date: Tue, 10 Jun 2014 22:17:47 +0000 Subject: [PATCH] Revert "[CMAKE/RPC]" This reverts commit a8356056cb870090a1fb39921e469b8410d36962. svn path=/trunk/; revision=63589 --- reactos/base/services/eventlog/CMakeLists.txt | 3 --- reactos/base/system/services/CMakeLists.txt | 3 --- reactos/cmake/widl-support.cmake | 4 ++-- reactos/dll/win32/advapi32/CMakeLists.txt | 3 --- reactos/dll/win32/lsasrv/CMakeLists.txt | 3 --- 5 files changed, 2 insertions(+), 14 deletions(-) diff --git a/reactos/base/services/eventlog/CMakeLists.txt b/reactos/base/services/eventlog/CMakeLists.txt index 50f0574d2bc..1f799c78f82 100644 --- a/reactos/base/services/eventlog/CMakeLists.txt +++ b/reactos/base/services/eventlog/CMakeLists.txt @@ -3,9 +3,6 @@ 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 6d89fb29441..c3ea514db36 100644 --- a/reactos/base/system/services/CMakeLists.txt +++ b/reactos/base/system/services/CMakeLists.txt @@ -4,9 +4,6 @@ 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 71a74b19118..4a93155c45f 100644 --- 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 -s -o) + set(__server_client -Oif -s -o) set(__suffix _s) elseif(__type STREQUAL "client") - set(__server_client -c -o) + set(__server_client -Oif -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 3dbfacbfb37..20cbef3e218 100644 --- a/reactos/dll/win32/advapi32/CMakeLists.txt +++ b/reactos/dll/win32/advapi32/CMakeLists.txt @@ -11,9 +11,6 @@ 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 02d990dd250..523841c7253 100644 --- a/reactos/dll/win32/lsasrv/CMakeLists.txt +++ b/reactos/dll/win32/lsasrv/CMakeLists.txt @@ -4,9 +4,6 @@ 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)