Skip to content

Commit

Permalink
Azure Enable GRPC for Win32 (#95)
Browse files Browse the repository at this point in the history
* 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.
  • Loading branch information
RobertBColton authored Mar 9, 2020
1 parent c42f7bc commit d7c4ea2
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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")
Expand Down Expand Up @@ -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()


Expand Down Expand Up @@ -315,4 +316,4 @@ if (WIN32)
fixup_bundle(\"${APPS}\" \"${LIBS}\" \"${SEARCH_PATHS}\")
execute_process(COMMAND windeployqt.exe ${WINDEPLOY_ARGS} ${APPS})
")
endif()
endif()

0 comments on commit d7c4ea2

Please sign in to comment.