[cmake] fix define_channel_options

* fix usage of default value * fix defaults of channels * unify to single CMake function define_channel_options
2026-04-14 00:14:11 +09:00 · 2024-12-17 16:12:49 +01:00
parent 60d5bd88f2
commit ac9cf26bce
31 changed files with 155 additions and 150 deletions
--- 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})
--- 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})
--- 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})
--- 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})
--- 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})
--- 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})
--- 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})
--- 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})
--- 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})
--- 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})
--- 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()
--- 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})
--- 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})
--- 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})
--- 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})
--- 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})
--- 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})
--- 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})
--- 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})
--- 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})
--- 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})
--- 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})
--- 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})
--- 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})
--- 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})
--- 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})
--- 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})
--- 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})
--- 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})
--- 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})
--- 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})