From d7c4ea2963765dcdba25aca64b3b776cadf08efd Mon Sep 17 00:00:00 2001 From: Robert Colton Date: Mon, 9 Mar 2020 03:45:47 -0400 Subject: [PATCH] Azure Enable GRPC for Win32 (#95) * Fix a mistake in the append of server plugin sources. Scope should be current, not the parent scope. * Change the server plugin option to a dependent option allowing us to enable it for Win32 and keep it disabled for all other platforms until GRPC is fixed on Linux. --- CMakeLists.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3f8638270..4d86754c7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,7 @@ cmake_minimum_required(VERSION 3.11) -option(RGM_ENABLE_GRPC_SERVER "Enable the GRPC client plugin for compilation and code analysis." OFF) +include(CMakeDependentOption) +cmake_dependent_option(RGM_ENABLE_GRPC_SERVER "Enable the GRPC client plugin for compilation and code analysis." ON "WIN32" OFF) if (CMAKE_BUILD_TYPE MATCHES "Debug") set(EXE "RadialGM-Debug") @@ -161,8 +162,8 @@ endif() if (RGM_ENABLE_GRPC_SERVER) add_definitions(-DRGM_SERVER_ENABLED) - set(RGM_SOURCES ${RGM_SOURCES} Plugins/ServerPlugin.cpp PARENT_SCOPE) - set(RGM_HEADERS ${RGM_HEADERS} Plugins/ServerPlugin.h PARENT_SCOPE) + set(RGM_SOURCES ${RGM_SOURCES} Plugins/ServerPlugin.cpp) + set(RGM_HEADERS ${RGM_HEADERS} Plugins/ServerPlugin.h) endif() @@ -315,4 +316,4 @@ if (WIN32) fixup_bundle(\"${APPS}\" \"${LIBS}\" \"${SEARCH_PATHS}\") execute_process(COMMAND windeployqt.exe ${WINDEPLOY_ARGS} ${APPS}) ") -endif() \ No newline at end of file +endif()