Merge pull request #5954 from akallabeth/server_config_options

Server config options

cmake/ConfigOptions.cmake

@@ -160,8 +160,3 @@ endif(ANDROID)
 if (IOS)
 	include(ConfigOptionsiOS)
 endif(IOS)
-
-if (WITH_SERVER)
-	# Proxy Options
-	option(WITH_PROXY_MODULES "Compile proxy modules" OFF)
-endif()

server/CMakeLists.txt

@@ -16,10 +16,18 @@
 # limitations under the License.
 
 # Servers
+include(CMakeDependentOption)
+
+CMAKE_DEPENDENT_OPTION(WITH_SHADOW "Compile with shadow server" ON	"WITH_SERVER" OFF)
+CMAKE_DEPENDENT_OPTION(WITH_PROXY "Compile with proxy server" ON	"WITH_SERVER" OFF)
 
 add_subdirectory(common)
-add_subdirectory(shadow)
-add_subdirectory(proxy)
+if (WITH_SHADOW)
+	add_subdirectory(shadow)
+endif()
+if (WITH_PROXY)
+	add_subdirectory(proxy)
+endif()
 
 if(FREERDP_VENDOR)
 	if(WITH_SAMPLE)

server/proxy/CMakeLists.txt

@@ -17,6 +17,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+include(CMakeDependentOption)
 set(MODULE_NAME "freerdp-proxy")
 set(MODULE_PREFIX "FREERDP_SERVER_PROXY")
 
@@ -88,6 +89,7 @@ endif()
 
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Server/proxy")
 
+CMAKE_DEPENDENT_OPTION(WITH_PROXY_MODULES "Compile proxy modules" OFF	"WITH_PROXY" OFF)
 if (WITH_PROXY_MODULES)
   add_subdirectory("modules")
 endif()

server/proxy/modules/demo/CMakeLists.txt

@@ -23,6 +23,7 @@ add_library(${PLUGIN_NAME} MODULE
 	demo.cpp
 )
 
+set_target_properties(${PLUGIN_NAME} PROPERTIES CXX_STANDARD 11)
 set_target_properties(${PLUGIN_NAME} PROPERTIES PREFIX "")
 set_target_properties(${PLUGIN_NAME} PROPERTIES NO_SONAME 1)
 set_target_properties(${PLUGIN_NAME} PROPERTIES