From ac9cf26bce2164516520f8fa08d34d7d5193d100 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Tue, 17 Dec 2024 16:12:49 +0100 Subject: [PATCH] [cmake] fix define_channel_options * fix usage of default value * fix defaults of channels * unify to single CMake function define_channel_options --- channels/CMakeLists.txt | 49 +++++++------------------ channels/ainput/ChannelOptions.cmake | 7 ++-- channels/audin/ChannelOptions.cmake | 9 +++-- channels/cliprdr/ChannelOptions.cmake | 9 +++-- channels/disp/ChannelOptions.cmake | 9 +++-- channels/drdynvc/ChannelOptions.cmake | 9 +++-- channels/drive/ChannelOptions.cmake | 9 +++-- channels/echo/ChannelOptions.cmake | 9 +++-- channels/encomsp/ChannelOptions.cmake | 9 +++-- channels/geometry/ChannelOptions.cmake | 8 ++-- channels/gfxredir/ChannelOptions.cmake | 8 ++-- channels/location/ChannelOptions.cmake | 7 ++-- channels/parallel/ChannelOptions.cmake | 9 +++-- channels/printer/ChannelOptions.cmake | 9 +++-- channels/rail/ChannelOptions.cmake | 9 +++-- channels/rdp2tcp/ChannelOptions.cmake | 7 ++-- channels/rdpdr/ChannelOptions.cmake | 9 +++-- channels/rdpear/ChannelOptions.cmake | 7 ++-- channels/rdpecam/ChannelOptions.cmake | 7 ++-- channels/rdpei/ChannelOptions.cmake | 9 +++-- channels/rdpemsc/ChannelOptions.cmake | 6 ++- channels/rdpgfx/ChannelOptions.cmake | 9 +++-- channels/rdpsnd/ChannelOptions.cmake | 9 +++-- channels/remdesk/ChannelOptions.cmake | 9 +++-- channels/serial/ChannelOptions.cmake | 9 +++-- channels/smartcard/ChannelOptions.cmake | 9 +++-- channels/sshagent/ChannelOptions.cmake | 6 ++- channels/telemetry/ChannelOptions.cmake | 8 ++-- channels/tsmf/ChannelOptions.cmake | 17 ++------- channels/urbdrc/ChannelOptions.cmake | 7 ++-- channels/video/ChannelOptions.cmake | 8 ++-- 31 files changed, 155 insertions(+), 150 deletions(-) diff --git a/channels/CMakeLists.txt b/channels/CMakeLists.txt index 080d062df..1815b724f 100644 --- a/channels/CMakeLists.txt +++ b/channels/CMakeLists.txt @@ -18,35 +18,27 @@ include(CMakeParseArguments) include(CMakeDependentOption) -macro(define_channel_options) +function(define_channel_options) set(PREFIX "CHANNEL") - cmake_parse_arguments(${PREFIX} "" "NAME;TYPE;DESCRIPTION;SPECIFICATIONS;DEFAULT" "" ${ARGN}) + cmake_parse_arguments( + ${PREFIX} "" "NAME;TYPE;DESCRIPTION;SPECIFICATIONS;DEFAULT;CLIENT_DEFAULT;SERVER_DEFAULT" "" ${ARGN} + ) string(TOUPPER "CHANNEL_${CHANNEL_NAME}" CHANNEL_OPTION) string(TOUPPER "CHANNEL_${CHANNEL_NAME}_CLIENT" CHANNEL_CLIENT_OPTION) string(TOUPPER "CHANNEL_${CHANNEL_NAME}_SERVER" CHANNEL_SERVER_OPTION) string(TOUPPER "${CHANNEL_TYPE}" CHANNEL_TYPE) - if(${${CHANNEL_CLIENT_OPTION}}) - set(OPTION_CLIENT_DEFAULT ${${CHANNEL_CLIENT_OPTION}}) - endif() - - if(${${CHANNEL_SERVER_OPTION}}) - set(OPTION_SERVER_DEFAULT ${${CHANNEL_SERVER_OPTION}}) - endif() - - if(${${CHANNEL_OPTION}}) - set(OPTION_DEFAULT ${${CHANNEL_OPTION}}) - endif() - - if(${OPTION_CLIENT_DEFAULT} OR ${OPTION_SERVER_DEFAULT}) + if(CHANNEL_DEFAULT) + set(OPTION_DEFAULT ${CHANNEL_DEFAULT}) + elseif(CHANNEL_CLIENT_OPTION OR CHANNEL_SERVER_OPTION) set(OPTION_DEFAULT "ON") endif() - set(CHANNEL_DEFAULT ${OPTION_DEFAULT}) - set(CHANNEL_OPTION_DOC "Build ${CHANNEL_NAME} ${CHANNEL_TYPE} channel") + set(CHANNEL_CLIENT_OPTION_DOC "Build ${CHANNEL_NAME} ${CHANNEL_TYPE} channel client") + set(CHANNEL_SERVER_OPTION_DOC "Build ${CHANNEL_NAME} ${CHANNEL_TYPE} channel server") if("${CHANNEL_TYPE}" STREQUAL "DYNAMIC") cmake_dependent_option(${CHANNEL_OPTION} "${CHANNEL_OPTION_DOC}" ${CHANNEL_DEFAULT} "CHANNEL_DRDYNVC" OFF) @@ -54,27 +46,14 @@ macro(define_channel_options) option(${CHANNEL_OPTION} "${CHANNEL_OPTION_DOC}" ${CHANNEL_DEFAULT}) endif() -endmacro(define_channel_options) - -macro(define_channel_client_options _channel_client_default) - string(TOUPPER "CHANNEL_${CHANNEL_NAME}_CLIENT" CHANNEL_CLIENT_OPTION) - string(TOUPPER "CHANNEL_${CHANNEL_NAME}" CHANNEL_OPTION) - set(CHANNEL_CLIENT_OPTION_DOC "Build ${CHANNEL_NAME} ${CHANNEL_TYPE} channel client") + cmake_dependent_option( + ${CHANNEL_CLIENT_OPTION} "${CHANNEL_CLIENT_OPTION_DOC}" ${CHANNEL_CLIENT_DEFAULT} "${CHANNEL_OPTION}" OFF + ) cmake_dependent_option( - ${CHANNEL_CLIENT_OPTION} "${CHANNEL_CLIENT_OPTION_DOC}" ${_channel_client_default} "${CHANNEL_OPTION}" OFF + ${CHANNEL_SERVER_OPTION} "${CHANNEL_SERVER_OPTION_DOC}" ${CHANNEL_SERVER_DEFAULT} "${CHANNEL_OPTION}" OFF ) -endmacro(define_channel_client_options) - -macro(define_channel_server_options _channel_server_default) - string(TOUPPER "CHANNEL_${CHANNEL_NAME}_SERVER" CHANNEL_SERVER_OPTION) - string(TOUPPER "CHANNEL_${CHANNEL_NAME}" CHANNEL_OPTION) - set(CHANNEL_SERVER_OPTION_DOC "Build ${CHANNEL_NAME} ${CHANNEL_TYPE} channel server") - - cmake_dependent_option( - ${CHANNEL_SERVER_OPTION} "${CHANNEL_SERVER_OPTION_DOC}" ${_channel_server_default} "${CHANNEL_OPTION}" OFF - ) -endmacro(define_channel_server_options) +endfunction(define_channel_options) macro(define_channel _channel_name) set(CHANNEL_NAME ${_channel_name}) diff --git a/channels/ainput/ChannelOptions.cmake b/channels/ainput/ChannelOptions.cmake index 2ac7cb37a..9902b790b 100644 --- a/channels/ainput/ChannelOptions.cmake +++ b/channels/ainput/ChannelOptions.cmake @@ -13,7 +13,8 @@ define_channel_options( "[XXXXX]" DEFAULT ${OPTION_DEFAULT} + CLIENT_DEFAULT + ${OPTION_CLIENT_DEFAULT} + SERVER_DEFAULT + ${OPTION_SERVER_DEFAULT} ) - -define_channel_client_options(${OPTION_CLIENT_DEFAULT}) -define_channel_server_options(${OPTION_SERVER_DEFAULT}) diff --git a/channels/audin/ChannelOptions.cmake b/channels/audin/ChannelOptions.cmake index 38d67c7ae..9956bf954 100644 --- a/channels/audin/ChannelOptions.cmake +++ b/channels/audin/ChannelOptions.cmake @@ -1,4 +1,4 @@ -set(OPTION_DEFAULT OFF) +set(OPTION_DEFAULT ON) set(OPTION_CLIENT_DEFAULT ON) set(OPTION_SERVER_DEFAULT ON) @@ -17,7 +17,8 @@ define_channel_options( "[MS-RDPEAI]" DEFAULT ${OPTION_DEFAULT} + CLIENT_DEFAULT + ${OPTION_CLIENT_DEFAULT} + SERVER_DEFAULT + ${OPTION_SERVER_DEFAULT} ) - -define_channel_client_options(${OPTION_CLIENT_DEFAULT}) -define_channel_server_options(${OPTION_SERVER_DEFAULT}) diff --git a/channels/cliprdr/ChannelOptions.cmake b/channels/cliprdr/ChannelOptions.cmake index 9464817b6..0787c08eb 100644 --- a/channels/cliprdr/ChannelOptions.cmake +++ b/channels/cliprdr/ChannelOptions.cmake @@ -1,4 +1,4 @@ -set(OPTION_DEFAULT OFF) +set(OPTION_DEFAULT ON) set(OPTION_CLIENT_DEFAULT ON) set(OPTION_SERVER_DEFAULT ON) @@ -13,7 +13,8 @@ define_channel_options( "[MS-RDPECLIP]" DEFAULT ${OPTION_DEFAULT} + CLIENT_DEFAULT + ${OPTION_CLIENT_DEFAULT} + SERVER_DEFAULT + ${OPTION_SERVER_DEFAULT} ) - -define_channel_client_options(${OPTION_CLIENT_DEFAULT}) -define_channel_server_options(${OPTION_SERVER_DEFAULT}) diff --git a/channels/disp/ChannelOptions.cmake b/channels/disp/ChannelOptions.cmake index 51f035948..416ec1768 100644 --- a/channels/disp/ChannelOptions.cmake +++ b/channels/disp/ChannelOptions.cmake @@ -1,4 +1,4 @@ -set(OPTION_DEFAULT OFF) +set(OPTION_DEFAULT ON) set(OPTION_CLIENT_DEFAULT ON) set(OPTION_SERVER_DEFAULT ON) @@ -13,7 +13,8 @@ define_channel_options( "[MS-RDPEDISP]" DEFAULT ${OPTION_DEFAULT} + CLIENT_DEFAULT + ${OPTION_CLIENT_DEFAULT} + SERVER_DEFAULT + ${OPTION_SERVER_DEFAULT} ) - -define_channel_client_options(${OPTION_CLIENT_DEFAULT}) -define_channel_server_options(${OPTION_SERVER_DEFAULT}) diff --git a/channels/drdynvc/ChannelOptions.cmake b/channels/drdynvc/ChannelOptions.cmake index c2de24c77..22652bbc2 100644 --- a/channels/drdynvc/ChannelOptions.cmake +++ b/channels/drdynvc/ChannelOptions.cmake @@ -1,4 +1,4 @@ -set(OPTION_DEFAULT OFF) +set(OPTION_DEFAULT ON) set(OPTION_CLIENT_DEFAULT ON) set(OPTION_SERVER_DEFAULT ON) @@ -13,7 +13,8 @@ define_channel_options( "[MS-RDPEDYC]" DEFAULT ${OPTION_DEFAULT} + CLIENT_DEFAULT + ${OPTION_CLIENT_DEFAULT} + SERVER_DEFAULT + ${OPTION_SERVER_DEFAULT} ) - -define_channel_client_options(${OPTION_CLIENT_DEFAULT}) -define_channel_server_options(${OPTION_SERVER_DEFAULT}) diff --git a/channels/drive/ChannelOptions.cmake b/channels/drive/ChannelOptions.cmake index 45b0f6dd5..3d11f1fe7 100644 --- a/channels/drive/ChannelOptions.cmake +++ b/channels/drive/ChannelOptions.cmake @@ -1,4 +1,4 @@ -set(OPTION_DEFAULT OFF) +set(OPTION_DEFAULT ON) set(OPTION_CLIENT_DEFAULT ON) set(OPTION_SERVER_DEFAULT OFF) @@ -13,7 +13,8 @@ define_channel_options( "[MS-RDPEFS]" DEFAULT ${OPTION_DEFAULT} + CLIENT_DEFAULT + ${OPTION_CLIENT_DEFAULT} + SERVER_DEFAULT + ${OPTION_SERVER_DEFAULT} ) - -define_channel_client_options(${OPTION_CLIENT_DEFAULT}) -define_channel_server_options(${OPTION_SERVER_DEFAULT}) diff --git a/channels/echo/ChannelOptions.cmake b/channels/echo/ChannelOptions.cmake index 28e761620..d805b58a1 100644 --- a/channels/echo/ChannelOptions.cmake +++ b/channels/echo/ChannelOptions.cmake @@ -1,4 +1,4 @@ -set(OPTION_DEFAULT OFF) +set(OPTION_DEFAULT ON) set(OPTION_CLIENT_DEFAULT ON) set(OPTION_SERVER_DEFAULT ON) @@ -13,7 +13,8 @@ define_channel_options( "[MS-RDPEECO]" DEFAULT ${OPTION_DEFAULT} + CLIENT_DEFAULT + ${OPTION_CLIENT_DEFAULT} + SERVER_DEFAULT + ${OPTION_SERVER_DEFAULT} ) - -define_channel_client_options(${OPTION_CLIENT_DEFAULT}) -define_channel_server_options(${OPTION_SERVER_DEFAULT}) diff --git a/channels/encomsp/ChannelOptions.cmake b/channels/encomsp/ChannelOptions.cmake index 3197aa0a5..974df5bb4 100644 --- a/channels/encomsp/ChannelOptions.cmake +++ b/channels/encomsp/ChannelOptions.cmake @@ -1,4 +1,4 @@ -set(OPTION_DEFAULT OFF) +set(OPTION_DEFAULT ON) set(OPTION_CLIENT_DEFAULT ON) set(OPTION_SERVER_DEFAULT ON) @@ -13,7 +13,8 @@ define_channel_options( "[MS-RDPEMC]" DEFAULT ${OPTION_DEFAULT} + CLIENT_DEFAULT + ${OPTION_CLIENT_DEFAULT} + SERVER_DEFAULT + ${OPTION_SERVER_DEFAULT} ) - -define_channel_client_options(${OPTION_CLIENT_DEFAULT}) -define_channel_server_options(${OPTION_SERVER_DEFAULT}) diff --git a/channels/geometry/ChannelOptions.cmake b/channels/geometry/ChannelOptions.cmake index 681ca15c1..994d4542a 100644 --- a/channels/geometry/ChannelOptions.cmake +++ b/channels/geometry/ChannelOptions.cmake @@ -1,4 +1,4 @@ -set(OPTION_DEFAULT OFF) +set(OPTION_DEFAULT ON) set(OPTION_CLIENT_DEFAULT ON) set(OPTION_SERVER_DEFAULT OFF) @@ -13,6 +13,8 @@ define_channel_options( "[MS-RDPEGT]" DEFAULT ${OPTION_DEFAULT} + CLIENT_DEFAULT + ${OPTION_CLIENT_DEFAULT} + SERVER_DEFAULT + ${OPTION_SERVER_DEFAULT} ) - -define_channel_client_options(${OPTION_CLIENT_DEFAULT}) diff --git a/channels/gfxredir/ChannelOptions.cmake b/channels/gfxredir/ChannelOptions.cmake index e96871e91..6ecadaf58 100644 --- a/channels/gfxredir/ChannelOptions.cmake +++ b/channels/gfxredir/ChannelOptions.cmake @@ -1,5 +1,5 @@ if(WITH_CHANNEL_GFXREDIR) - set(OPTION_DEFAULT OFF) + set(OPTION_DEFAULT ON) set(OPTION_CLIENT_DEFAULT OFF) set(OPTION_SERVER_DEFAULT ON) @@ -14,7 +14,9 @@ if(WITH_CHANNEL_GFXREDIR) "[MS-RDPXXXX]" DEFAULT ${OPTION_DEFAULT} + CLIENT_DEFAULT + ${OPTION_CLIENT_DEFAULT} + SERVER_DEFAULT + ${OPTION_SERVER_DEFAULT} ) - - define_channel_server_options(${OPTION_SERVER_DEFAULT}) endif() diff --git a/channels/location/ChannelOptions.cmake b/channels/location/ChannelOptions.cmake index 47f9c9eef..465173a66 100644 --- a/channels/location/ChannelOptions.cmake +++ b/channels/location/ChannelOptions.cmake @@ -13,7 +13,8 @@ define_channel_options( "[MS-RDPEL]" DEFAULT ${OPTION_DEFAULT} + CLIENT_DEFAULT + ${OPTION_CLIENT_DEFAULT} + SERVER_DEFAULT + ${OPTION_SERVER_DEFAULT} ) - -define_channel_client_options(${OPTION_CLIENT_DEFAULT}) -define_channel_server_options(${OPTION_SERVER_DEFAULT}) diff --git a/channels/parallel/ChannelOptions.cmake b/channels/parallel/ChannelOptions.cmake index dff863cca..1bac3ae03 100644 --- a/channels/parallel/ChannelOptions.cmake +++ b/channels/parallel/ChannelOptions.cmake @@ -1,4 +1,4 @@ -set(OPTION_DEFAULT OFF) +set(OPTION_DEFAULT ON) set(OPTION_CLIENT_DEFAULT ON) set(OPTION_SERVER_DEFAULT OFF) @@ -31,7 +31,8 @@ define_channel_options( "[MS-RDPESP]" DEFAULT ${OPTION_DEFAULT} + CLIENT_DEFAULT + ${OPTION_CLIENT_DEFAULT} + SERVER_DEFAULT + ${OPTION_SERVER_DEFAULT} ) - -define_channel_client_options(${OPTION_CLIENT_DEFAULT}) -define_channel_server_options(${OPTION_SERVER_DEFAULT}) diff --git a/channels/printer/ChannelOptions.cmake b/channels/printer/ChannelOptions.cmake index fbca61bcd..5f315f998 100644 --- a/channels/printer/ChannelOptions.cmake +++ b/channels/printer/ChannelOptions.cmake @@ -1,4 +1,4 @@ -set(OPTION_DEFAULT OFF) +set(OPTION_DEFAULT ON) set(OPTION_CLIENT_DEFAULT ON) set(OPTION_SERVER_DEFAULT OFF) @@ -33,7 +33,8 @@ define_channel_options( "[MS-RDPEPC]" DEFAULT ${OPTION_DEFAULT} + CLIENT_DEFAULT + ${OPTION_CLIENT_DEFAULT} + SERVER_DEFAULT + ${OPTION_SERVER_DEFAULT} ) - -define_channel_client_options(${OPTION_CLIENT_DEFAULT}) -define_channel_server_options(${OPTION_SERVER_DEFAULT}) diff --git a/channels/rail/ChannelOptions.cmake b/channels/rail/ChannelOptions.cmake index 0b1170e82..8cff63684 100644 --- a/channels/rail/ChannelOptions.cmake +++ b/channels/rail/ChannelOptions.cmake @@ -1,4 +1,4 @@ -set(OPTION_DEFAULT OFF) +set(OPTION_DEFAULT ON) set(OPTION_CLIENT_DEFAULT ON) set(OPTION_SERVER_DEFAULT ON) @@ -13,7 +13,8 @@ define_channel_options( "[MS-RDPERP]" DEFAULT ${OPTION_DEFAULT} + CLIENT_DEFAULT + ${OPTION_CLIENT_DEFAULT} + SERVER_DEFAULT + ${OPTION_SERVER_DEFAULT} ) - -define_channel_client_options(${OPTION_CLIENT_DEFAULT}) -define_channel_server_options(${OPTION_SERVER_DEFAULT}) diff --git a/channels/rdp2tcp/ChannelOptions.cmake b/channels/rdp2tcp/ChannelOptions.cmake index 502510da9..ca2188751 100644 --- a/channels/rdp2tcp/ChannelOptions.cmake +++ b/channels/rdp2tcp/ChannelOptions.cmake @@ -11,7 +11,8 @@ define_channel_options( "Tunneling TCP over RDP" DEFAULT ${OPTION_DEFAULT} + CLIENT_DEFAULT + ${OPTION_CLIENT_DEFAULT} + SERVER_DEFAULT + ${OPTION_SERVER_DEFAULT} ) - -define_channel_client_options(${OPTION_CLIENT_DEFAULT}) -define_channel_server_options(${OPTION_SERVER_DEFAULT}) diff --git a/channels/rdpdr/ChannelOptions.cmake b/channels/rdpdr/ChannelOptions.cmake index 3a4792fd4..6bc5fc244 100644 --- a/channels/rdpdr/ChannelOptions.cmake +++ b/channels/rdpdr/ChannelOptions.cmake @@ -1,4 +1,4 @@ -set(OPTION_DEFAULT OFF) +set(OPTION_DEFAULT ON) set(OPTION_CLIENT_DEFAULT ON) set(OPTION_SERVER_DEFAULT ON) @@ -13,7 +13,8 @@ define_channel_options( "[MS-RDPEFS] [MS-RDPEPC] [MS-RDPESC] [MS-RDPESP]" DEFAULT ${OPTION_DEFAULT} + CLIENT_DEFAULT + ${OPTION_CLIENT_DEFAULT} + SERVER_DEFAULT + ${OPTION_SERVER_DEFAULT} ) - -define_channel_client_options(${OPTION_CLIENT_DEFAULT}) -define_channel_server_options(${OPTION_SERVER_DEFAULT}) diff --git a/channels/rdpear/ChannelOptions.cmake b/channels/rdpear/ChannelOptions.cmake index 3ee004b78..636701d3e 100644 --- a/channels/rdpear/ChannelOptions.cmake +++ b/channels/rdpear/ChannelOptions.cmake @@ -13,7 +13,8 @@ define_channel_options( "[MS-RDPEAR]" DEFAULT ${OPTION_DEFAULT} + CLIENT_DEFAULT + ${OPTION_CLIENT_DEFAULT} + SERVER_DEFAULT + ${OPTION_SERVER_DEFAULT} ) - -define_channel_client_options(${OPTION_CLIENT_DEFAULT}) -define_channel_server_options(${OPTION_SERVER_DEFAULT}) diff --git a/channels/rdpecam/ChannelOptions.cmake b/channels/rdpecam/ChannelOptions.cmake index 42ae2bd28..ba12c2d8b 100644 --- a/channels/rdpecam/ChannelOptions.cmake +++ b/channels/rdpecam/ChannelOptions.cmake @@ -13,7 +13,8 @@ define_channel_options( "[MS-RDPECAM]" DEFAULT ${OPTION_DEFAULT} + CLIENT_DEFAULT + ${OPTION_CLIENT_DEFAULT} + SERVER_DEFAULT + ${OPTION_SERVER_DEFAULT} ) - -define_channel_server_options(${OPTION_SERVER_DEFAULT}) -define_channel_client_options(${OPTION_CLIENT_DEFAULT}) diff --git a/channels/rdpei/ChannelOptions.cmake b/channels/rdpei/ChannelOptions.cmake index cf5e96a27..6f6d568f6 100644 --- a/channels/rdpei/ChannelOptions.cmake +++ b/channels/rdpei/ChannelOptions.cmake @@ -1,4 +1,4 @@ -set(OPTION_DEFAULT OFF) +set(OPTION_DEFAULT ON) set(OPTION_CLIENT_DEFAULT ON) set(OPTION_SERVER_DEFAULT ON) @@ -13,7 +13,8 @@ define_channel_options( "[MS-RDPEI]" DEFAULT ${OPTION_DEFAULT} + CLIENT_DEFAULT + ${OPTION_CLIENT_DEFAULT} + SERVER_DEFAULT + ${OPTION_SERVER_DEFAULT} ) - -define_channel_client_options(${OPTION_CLIENT_DEFAULT}) -define_channel_server_options(${OPTION_SERVER_DEFAULT}) diff --git a/channels/rdpemsc/ChannelOptions.cmake b/channels/rdpemsc/ChannelOptions.cmake index fb4214537..df2563f92 100644 --- a/channels/rdpemsc/ChannelOptions.cmake +++ b/channels/rdpemsc/ChannelOptions.cmake @@ -13,6 +13,8 @@ define_channel_options( "[MS-RDPEMSC]" DEFAULT ${OPTION_DEFAULT} + CLIENT_DEFAULT + ${OPTION_CLIENT_DEFAULT} + SERVER_DEFAULT + ${OPTION_SERVER_DEFAULT} ) - -define_channel_server_options(${OPTION_SERVER_DEFAULT}) diff --git a/channels/rdpgfx/ChannelOptions.cmake b/channels/rdpgfx/ChannelOptions.cmake index b2591dc23..ce3b5e3e8 100644 --- a/channels/rdpgfx/ChannelOptions.cmake +++ b/channels/rdpgfx/ChannelOptions.cmake @@ -1,4 +1,4 @@ -set(OPTION_DEFAULT OFF) +set(OPTION_DEFAULT ON) set(OPTION_CLIENT_DEFAULT ON) set(OPTION_SERVER_DEFAULT ON) @@ -13,7 +13,8 @@ define_channel_options( "[MS-RDPEGFX]" DEFAULT ${OPTION_DEFAULT} + CLIENT_DEFAULT + ${OPTION_CLIENT_DEFAULT} + SERVER_DEFAULT + ${OPTION_SERVER_DEFAULT} ) - -define_channel_client_options(${OPTION_CLIENT_DEFAULT}) -define_channel_server_options(${OPTION_SERVER_DEFAULT}) diff --git a/channels/rdpsnd/ChannelOptions.cmake b/channels/rdpsnd/ChannelOptions.cmake index 71b9033a3..f4a76335e 100644 --- a/channels/rdpsnd/ChannelOptions.cmake +++ b/channels/rdpsnd/ChannelOptions.cmake @@ -1,4 +1,4 @@ -set(OPTION_DEFAULT OFF) +set(OPTION_DEFAULT ON) set(OPTION_CLIENT_DEFAULT ON) set(OPTION_SERVER_DEFAULT ON) @@ -13,7 +13,8 @@ define_channel_options( "[MS-RDPEA]" DEFAULT ${OPTION_DEFAULT} + CLIENT_DEFAULT + ${OPTION_CLIENT_DEFAULT} + SERVER_DEFAULT + ${OPTION_SERVER_DEFAULT} ) - -define_channel_client_options(${OPTION_CLIENT_DEFAULT}) -define_channel_server_options(${OPTION_SERVER_DEFAULT}) diff --git a/channels/remdesk/ChannelOptions.cmake b/channels/remdesk/ChannelOptions.cmake index 2644a8c74..652e2b736 100644 --- a/channels/remdesk/ChannelOptions.cmake +++ b/channels/remdesk/ChannelOptions.cmake @@ -1,4 +1,4 @@ -set(OPTION_DEFAULT OFF) +set(OPTION_DEFAULT ON) set(OPTION_CLIENT_DEFAULT ON) set(OPTION_SERVER_DEFAULT ON) @@ -13,7 +13,8 @@ define_channel_options( "[MS-RA]" DEFAULT ${OPTION_DEFAULT} + CLIENT_DEFAULT + ${OPTION_CLIENT_DEFAULT} + SERVER_DEFAULT + ${OPTION_SERVER_DEFAULT} ) - -define_channel_client_options(${OPTION_CLIENT_DEFAULT}) -define_channel_server_options(${OPTION_SERVER_DEFAULT}) diff --git a/channels/serial/ChannelOptions.cmake b/channels/serial/ChannelOptions.cmake index 359e1f21c..7f4767818 100644 --- a/channels/serial/ChannelOptions.cmake +++ b/channels/serial/ChannelOptions.cmake @@ -1,4 +1,4 @@ -set(OPTION_DEFAULT OFF) +set(OPTION_DEFAULT ON) set(OPTION_CLIENT_DEFAULT ON) set(OPTION_SERVER_DEFAULT OFF) @@ -31,7 +31,8 @@ define_channel_options( "[MS-RDPESP]" DEFAULT ${OPTION_DEFAULT} + CLIENT_DEFAULT + ${OPTION_CLIENT_DEFAULT} + SERVER_DEFAULT + ${OPTION_SERVER_DEFAULT} ) - -define_channel_client_options(${OPTION_CLIENT_DEFAULT}) -define_channel_server_options(${OPTION_SERVER_DEFAULT}) diff --git a/channels/smartcard/ChannelOptions.cmake b/channels/smartcard/ChannelOptions.cmake index 83f0176b3..14966b0e6 100644 --- a/channels/smartcard/ChannelOptions.cmake +++ b/channels/smartcard/ChannelOptions.cmake @@ -1,4 +1,4 @@ -set(OPTION_DEFAULT OFF) +set(OPTION_DEFAULT ON) set(OPTION_CLIENT_DEFAULT ON) set(OPTION_SERVER_DEFAULT OFF) @@ -13,7 +13,8 @@ define_channel_options( "[MS-RDPESC]" DEFAULT ${OPTION_DEFAULT} + CLIENT_DEFAULT + ${OPTION_CLIENT_DEFAULT} + SERVER_DEFAULT + ${OPTION_SERVER_DEFAULT} ) - -define_channel_client_options(${OPTION_CLIENT_DEFAULT}) -define_channel_server_options(${OPTION_SERVER_DEFAULT}) diff --git a/channels/sshagent/ChannelOptions.cmake b/channels/sshagent/ChannelOptions.cmake index c27ca52f8..569f067b2 100644 --- a/channels/sshagent/ChannelOptions.cmake +++ b/channels/sshagent/ChannelOptions.cmake @@ -13,6 +13,8 @@ define_channel_options( "" DEFAULT ${OPTION_DEFAULT} + CLIENT_DEFAULT + ${OPTION_CLIENT_DEFAULT} + SERVER_DEFAULT + ${OPTION_SERVER_DEFAULT} ) - -define_channel_client_options(${OPTION_CLIENT_DEFAULT}) diff --git a/channels/telemetry/ChannelOptions.cmake b/channels/telemetry/ChannelOptions.cmake index 73aca3e38..153fd57b3 100644 --- a/channels/telemetry/ChannelOptions.cmake +++ b/channels/telemetry/ChannelOptions.cmake @@ -1,4 +1,4 @@ -set(OPTION_DEFAULT OFF) +set(OPTION_DEFAULT ON) set(OPTION_CLIENT_DEFAULT OFF) set(OPTION_SERVER_DEFAULT ON) @@ -13,6 +13,8 @@ define_channel_options( "[MS-RDPET]" DEFAULT ${OPTION_DEFAULT} + CLIENT_DEFAULT + ${OPTION_CLIENT_DEFAULT} + SERVER_DEFAULT + ${OPTION_SERVER_DEFAULT} ) - -define_channel_server_options(${OPTION_SERVER_DEFAULT}) diff --git a/channels/tsmf/ChannelOptions.cmake b/channels/tsmf/ChannelOptions.cmake index 0610f182f..1a17beac2 100644 --- a/channels/tsmf/ChannelOptions.cmake +++ b/channels/tsmf/ChannelOptions.cmake @@ -2,16 +2,6 @@ set(OPTION_DEFAULT OFF) set(OPTION_CLIENT_DEFAULT OFF) set(OPTION_SERVER_DEFAULT OFF) -if(WIN32) - set(OPTION_CLIENT_DEFAULT OFF) - set(OPTION_SERVER_DEFAULT OFF) -endif() - -if(ANDROID) - set(OPTION_CLIENT_DEFAULT OFF) - set(OPTION_SERVER_DEFAULT OFF) -endif() - define_channel_options( NAME "tsmf" @@ -23,7 +13,8 @@ define_channel_options( "[MS-RDPEV]" DEFAULT ${OPTION_DEFAULT} + CLIENT_DEFAULT + ${OPTION_CLIENT_DEFAULT} + SERVER_DEFAULT + ${OPTION_SERVER_DEFAULT} ) - -define_channel_client_options(${OPTION_CLIENT_DEFAULT}) -define_channel_server_options(${OPTION_SERVER_DEFAULT}) diff --git a/channels/urbdrc/ChannelOptions.cmake b/channels/urbdrc/ChannelOptions.cmake index 1770dbbd2..2612bb1fe 100644 --- a/channels/urbdrc/ChannelOptions.cmake +++ b/channels/urbdrc/ChannelOptions.cmake @@ -19,7 +19,8 @@ define_channel_options( "[MS-RDPEUSB]" DEFAULT ${OPTION_DEFAULT} + CLIENT_DEFAULT + ${OPTION_CLIENT_DEFAULT} + SERVER_DEFAULT + ${OPTION_SERVER_DEFAULT} ) - -define_channel_client_options(${OPTION_CLIENT_DEFAULT}) -define_channel_server_options(${OPTION_SERVER_DEFAULT}) diff --git a/channels/video/ChannelOptions.cmake b/channels/video/ChannelOptions.cmake index 50caf00a1..c477a741e 100644 --- a/channels/video/ChannelOptions.cmake +++ b/channels/video/ChannelOptions.cmake @@ -1,4 +1,4 @@ -set(OPTION_DEFAULT OFF) +set(OPTION_DEFAULT ON) set(OPTION_CLIENT_DEFAULT ON) set(OPTION_SERVER_DEFAULT OFF) @@ -13,6 +13,8 @@ define_channel_options( "[MS-RDPEVOR]" DEFAULT ${OPTION_DEFAULT} + CLIENT_DEFAULT + ${OPTION_CLIENT_DEFAULT} + SERVER_DEFAULT + ${OPTION_SERVER_DEFAULT} ) - -define_channel_client_options(${OPTION_CLIENT_DEFAULT})