[ros-diffs] [reactos] 01/01: [RPCRT4][RPCRT4_WINETEST] Don't unset IDL_FLAGS. Fixes build on 64 bit hosts.

[Thomas Faber]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1a14dcb53f192b429dd0f…

commit 1a14dcb53f192b429dd0fee7406ada0a6d4e0c49
Author:     Thomas Faber <thomas.faber(a)reactos.org>
AuthorDate: Sat Feb 2 19:03:40 2019 +0100
Commit:     Thomas Faber <thomas.faber(a)reactos.org>
CommitDate: Sat Feb 2 19:06:04 2019 +0100

    [RPCRT4][RPCRT4_WINETEST] Don't unset IDL_FLAGS. Fixes build on 64 bit hosts.
---
 dll/win32/rpcrt4/CMakeLists.txt                  | 3 ++-
 modules/rostests/winetests/rpcrt4/CMakeLists.txt | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dll/win32/rpcrt4/CMakeLists.txt b/dll/win32/rpcrt4/CMakeLists.txt
index 212231a3a2..24c5d8fb40 100644
--- a/dll/win32/rpcrt4/CMakeLists.txt
+++ b/dll/win32/rpcrt4/CMakeLists.txt
@@ -14,9 +14,10 @@ spec2def(rpcrt4.dll rpcrt4.spec ADD_IMPORTLIB)
 add_rpc_files(client epm.idl)
 add_idl_headers(ndr_types_header ndr_types.idl)
 
+set(OLD_IDL_FLAGS ${IDL_FLAGS})
 set(IDL_FLAGS ${IDL_FLAGS} -Oicf)
 add_rpcproxy_files(ndr_types.idl)
-unset(IDL_FLAGS)
+set(IDL_FLAGS ${OLD_IDL_FLAGS})
 
 list(APPEND SOURCE
     cproxy.c
diff --git a/modules/rostests/winetests/rpcrt4/CMakeLists.txt
b/modules/rostests/winetests/rpcrt4/CMakeLists.txt
index dbb7cf7fc1..4eeac9d3af 100644
--- a/modules/rostests/winetests/rpcrt4/CMakeLists.txt
+++ b/modules/rostests/winetests/rpcrt4/CMakeLists.txt
@@ -7,10 +7,11 @@ add_definitions(
     -DPROXY_DELEGATION)
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
+set(OLD_IDL_FLAGS ${IDL_FLAGS})
 set(IDL_FLAGS ${IDL_FLAGS} --prefix-server=s_)
 add_rpc_files(client server.idl)
 add_rpc_files(server server.idl)
-unset(IDL_FLAGS)
+set(IDL_FLAGS ${OLD_IDL_FLAGS})
 add_rpcproxy_files(cstub.idl)
 
 list(APPEND SOURCE