From cffbbacccdba54389cecffd887824e520d7cc32b Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Mon, 9 Mar 2020 09:14:50 +0100 Subject: [PATCH] Default proxy modules to OFF The proxy module sample is c++ 11 which some older build targets do not like. Deactivate this by default. --- server/CMakeLists.txt | 1 - server/proxy/CMakeLists.txt | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt index 2f6eebc68..e91757e12 100644 --- a/server/CMakeLists.txt +++ b/server/CMakeLists.txt @@ -20,7 +20,6 @@ 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) -CMAKE_DEPENDENT_OPTION(WITH_PROXY_MODULES "Compile proxy modules" ON "WITH_PROXY" OFF) add_subdirectory(common) if (WITH_SHADOW) diff --git a/server/proxy/CMakeLists.txt b/server/proxy/CMakeLists.txt index 81979e997..3609f4a99 100644 --- a/server/proxy/CMakeLists.txt +++ b/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()