From cf9777cd92abd111bf05313425ccaf209d198f76 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Mon, 20 Feb 2023 10:33:23 +0100 Subject: [PATCH] [channels] simplified server linking --- channels/CMakeLists.txt | 8 ++++---- channels/ainput/server/CMakeLists.txt | 9 +++++---- channels/audin/server/CMakeLists.txt | 12 +++++------- channels/cliprdr/server/CMakeLists.txt | 9 ++++----- channels/disp/server/CMakeLists.txt | 8 ++++---- channels/drdynvc/server/CMakeLists.txt | 13 +++++-------- channels/echo/server/CMakeLists.txt | 13 +++++-------- channels/encomsp/server/CMakeLists.txt | 15 +++++---------- channels/gfxredir/server/CMakeLists.txt | 8 ++++---- channels/rail/server/CMakeLists.txt | 11 ++++++----- channels/rdpdr/server/CMakeLists.txt | 14 ++++++-------- channels/rdpecam/server/CMakeLists.txt | 10 ++++++---- channels/rdpei/server/CMakeLists.txt | 11 ++++------- channels/rdpgfx/server/CMakeLists.txt | 13 ++++++------- channels/rdpsnd/server/CMakeLists.txt | 2 -- channels/remdesk/server/CMakeLists.txt | 14 ++++++-------- channels/telemetry/server/CMakeLists.txt | 10 ++++++---- 17 files changed, 81 insertions(+), 99 deletions(-) diff --git a/channels/CMakeLists.txt b/channels/CMakeLists.txt index 3b1e1d90b..ab9c79f0c 100644 --- a/channels/CMakeLists.txt +++ b/channels/CMakeLists.txt @@ -223,14 +223,14 @@ macro(add_channel_server_library _module_prefix _module_name _channel_name _dyna set(${_module_prefix}_NAME ${_module_name} PARENT_SCOPE) set(${_module_prefix}_CHANNEL ${_channel_name} PARENT_SCOPE) set(${_module_prefix}_ENTRY ${_entry} PARENT_SCOPE) - add_library(${_module_name} STATIC ${${_module_prefix}_SRCS}) + + add_library(${_module_name} OBJECT ${${_module_prefix}_SRCS}) + set_property(TARGET ${_module_name} PROPERTY POSITION_INDEPENDENT_CODE ON) + set_property(TARGET ${_module_name} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Server") if (${${_module_prefix}_LIBS}) target_link_libraries(${_module_name} PRIVATE ${${_module_prefix}_LIBS}) endif() - if (NOT BUILD_SHARED_LIBS) - server_channel_install(${_module_name} ${FREERDP_ADDIN_PATH}) - endif() endmacro(add_channel_server_library) set(FILENAME "ChannelOptions.cmake") diff --git a/channels/ainput/server/CMakeLists.txt b/channels/ainput/server/CMakeLists.txt index 59be263a7..13bf2e4cd 100644 --- a/channels/ainput/server/CMakeLists.txt +++ b/channels/ainput/server/CMakeLists.txt @@ -19,9 +19,10 @@ define_channel_server("ainput") set(${MODULE_PREFIX}_SRCS - ainput_main.c) + ainput_main.c +) +set(${MODULE_PREFIX}_LIBS + freerdp +) add_channel_server_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "DVCPluginEntry") - -target_link_libraries(${MODULE_NAME} freerdp) -set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Server") diff --git a/channels/audin/server/CMakeLists.txt b/channels/audin/server/CMakeLists.txt index 4d4004fb3..454d2a601 100644 --- a/channels/audin/server/CMakeLists.txt +++ b/channels/audin/server/CMakeLists.txt @@ -18,12 +18,10 @@ define_channel_server("audin") set(${MODULE_PREFIX}_SRCS - audin.c) + audin.c +) +set(${MODULE_PREFIX}_LIBS + freerdp +) add_channel_server_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "DVCPluginEntry") - - - -target_link_libraries(${MODULE_NAME} freerdp) - -set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Server") diff --git a/channels/cliprdr/server/CMakeLists.txt b/channels/cliprdr/server/CMakeLists.txt index 32ffbaa15..09c6a7eaf 100644 --- a/channels/cliprdr/server/CMakeLists.txt +++ b/channels/cliprdr/server/CMakeLists.txt @@ -22,10 +22,9 @@ set(${MODULE_PREFIX}_SRCS cliprdr_main.h ../cliprdr_common.h ../cliprdr_common.c - ) +) +set(${MODULE_PREFIX}_LIBS + freerdp +) add_channel_server_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "VirtualChannelEntry") - -target_link_libraries(${MODULE_NAME} freerdp) - -set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Server") diff --git a/channels/disp/server/CMakeLists.txt b/channels/disp/server/CMakeLists.txt index dddc15b05..3c0e3b68e 100644 --- a/channels/disp/server/CMakeLists.txt +++ b/channels/disp/server/CMakeLists.txt @@ -22,11 +22,11 @@ set(${MODULE_PREFIX}_SRCS disp_main.h ../disp_common.c ../disp_common.h - ) +) +set(${MODULE_PREFIX}_LIBS + freerdp +) include_directories(..) add_channel_server_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "DVCPluginEntry") - -target_link_libraries(${MODULE_NAME} freerdp) -set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Server") diff --git a/channels/drdynvc/server/CMakeLists.txt b/channels/drdynvc/server/CMakeLists.txt index fe2bd61c2..85b1bd62b 100644 --- a/channels/drdynvc/server/CMakeLists.txt +++ b/channels/drdynvc/server/CMakeLists.txt @@ -19,13 +19,10 @@ define_channel_server("drdynvc") set(${MODULE_PREFIX}_SRCS drdynvc_main.c - drdynvc_main.h) + drdynvc_main.h +) +set(${MODULE_PREFIX}_LIBS + freerdp +) add_channel_server_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "VirtualChannelEntry") - - - -target_link_libraries(${MODULE_NAME} freerdp) - - -set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Server") diff --git a/channels/echo/server/CMakeLists.txt b/channels/echo/server/CMakeLists.txt index e69b55501..2d13946b9 100644 --- a/channels/echo/server/CMakeLists.txt +++ b/channels/echo/server/CMakeLists.txt @@ -18,13 +18,10 @@ define_channel_server("echo") set(${MODULE_PREFIX}_SRCS - echo_main.c) + echo_main.c +) +set(${MODULE_PREFIX}_LIBS + freerdp +) add_channel_server_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "DVCPluginEntry") - - - -target_link_libraries(${MODULE_NAME} freerdp) - - -set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Server") diff --git a/channels/encomsp/server/CMakeLists.txt b/channels/encomsp/server/CMakeLists.txt index 10ac0c6d9..096e6d0d2 100644 --- a/channels/encomsp/server/CMakeLists.txt +++ b/channels/encomsp/server/CMakeLists.txt @@ -21,15 +21,10 @@ include_directories(..) set(${MODULE_PREFIX}_SRCS encomsp_main.c - encomsp_main.h) + encomsp_main.h +) +set(${MODULE_PREFIX}_LIBS + winpr +) add_channel_server_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "VirtualChannelEntry") - - - -set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr) - -target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS}) - - -set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Server") diff --git a/channels/gfxredir/server/CMakeLists.txt b/channels/gfxredir/server/CMakeLists.txt index 41cf225e6..19a57afcd 100644 --- a/channels/gfxredir/server/CMakeLists.txt +++ b/channels/gfxredir/server/CMakeLists.txt @@ -22,11 +22,11 @@ set(${MODULE_PREFIX}_SRCS gfxredir_main.h ../gfxredir_common.c ../gfxredir_common.h - ) +) +set(${MODULE_PREFIX}_LIBS + freerdp +) include_directories(..) add_channel_server_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "DVCPluginEntry") - -target_link_libraries(${MODULE_NAME} freerdp) -set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Server") diff --git a/channels/rail/server/CMakeLists.txt b/channels/rail/server/CMakeLists.txt index c7f1c7a7f..f8f64be92 100644 --- a/channels/rail/server/CMakeLists.txt +++ b/channels/rail/server/CMakeLists.txt @@ -21,12 +21,13 @@ set(${MODULE_PREFIX}_SRCS ../rail_common.c ../rail_common.h rail_main.c - rail_main.h) + rail_main.h +) + +set(${MODULE_PREFIX}_LIBS + freerdp +) include_directories(..) add_channel_server_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "VirtualChannelEntryEx") - -target_link_libraries(${MODULE_NAME} freerdp) - -set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Server") diff --git a/channels/rdpdr/server/CMakeLists.txt b/channels/rdpdr/server/CMakeLists.txt index 63f8a0437..7d1f7e5bf 100644 --- a/channels/rdpdr/server/CMakeLists.txt +++ b/channels/rdpdr/server/CMakeLists.txt @@ -19,13 +19,11 @@ define_channel_server("rdpdr") set(${MODULE_PREFIX}_SRCS rdpdr_main.c - rdpdr_main.h) + rdpdr_main.h +) + +set(${MODULE_PREFIX}_LIBS + freerdp +) add_channel_server_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "VirtualChannelEntry") - - - -target_link_libraries(${MODULE_NAME} freerdp) - - -set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Server") diff --git a/channels/rdpecam/server/CMakeLists.txt b/channels/rdpecam/server/CMakeLists.txt index 2a65ba7fe..2f824284d 100644 --- a/channels/rdpecam/server/CMakeLists.txt +++ b/channels/rdpecam/server/CMakeLists.txt @@ -19,9 +19,11 @@ define_channel_server("rdpecam") set(${MODULE_PREFIX}_SRCS camera_device_enumerator_main.c - camera_device_main.c) + camera_device_main.c +) + +set(${MODULE_PREFIX}_LIBS + freerdp +) add_channel_server_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "DVCPluginEntry") - -target_link_libraries(${MODULE_NAME} freerdp) -set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Server") diff --git a/channels/rdpei/server/CMakeLists.txt b/channels/rdpei/server/CMakeLists.txt index b2a464ded..21c96eed6 100644 --- a/channels/rdpei/server/CMakeLists.txt +++ b/channels/rdpei/server/CMakeLists.txt @@ -25,11 +25,8 @@ set(${MODULE_PREFIX}_SRCS ../rdpei_common.h ) +set(${MODULE_PREFIX}_LIBS + winpr +) + add_channel_server_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "VirtualChannelEntry") - -set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr) - -target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS}) - - -set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Server") diff --git a/channels/rdpgfx/server/CMakeLists.txt b/channels/rdpgfx/server/CMakeLists.txt index 1b1f48b20..d33b7101a 100644 --- a/channels/rdpgfx/server/CMakeLists.txt +++ b/channels/rdpgfx/server/CMakeLists.txt @@ -21,14 +21,13 @@ set(${MODULE_PREFIX}_SRCS rdpgfx_main.c rdpgfx_main.h ../rdpgfx_common.c - ../rdpgfx_common.h) + ../rdpgfx_common.h +) + +set(${MODULE_PREFIX}_LIBS + freerdp +) include_directories(..) add_channel_server_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "DVCPluginEntry") - - - -target_link_libraries(${MODULE_NAME} freerdp) - -set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Server") diff --git a/channels/rdpsnd/server/CMakeLists.txt b/channels/rdpsnd/server/CMakeLists.txt index 8a8ba3ef2..ab983abf3 100644 --- a/channels/rdpsnd/server/CMakeLists.txt +++ b/channels/rdpsnd/server/CMakeLists.txt @@ -26,5 +26,3 @@ set(${MODULE_PREFIX}_LIBS ) add_channel_server_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "VirtualChannelEntry") - -set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Server") diff --git a/channels/remdesk/server/CMakeLists.txt b/channels/remdesk/server/CMakeLists.txt index dc59a1129..f8a395e63 100644 --- a/channels/remdesk/server/CMakeLists.txt +++ b/channels/remdesk/server/CMakeLists.txt @@ -19,13 +19,11 @@ define_channel_server("remdesk") set(${MODULE_PREFIX}_SRCS remdesk_main.c - remdesk_main.h) + remdesk_main.h +) + +set(${MODULE_PREFIX}_LIBS + winpr +) add_channel_server_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "VirtualChannelEntry") - -set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr) - -target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS}) - - -set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Server") diff --git a/channels/telemetry/server/CMakeLists.txt b/channels/telemetry/server/CMakeLists.txt index 75be8ac9e..6977b63f9 100644 --- a/channels/telemetry/server/CMakeLists.txt +++ b/channels/telemetry/server/CMakeLists.txt @@ -18,9 +18,11 @@ define_channel_server("telemetry") set(${MODULE_PREFIX}_SRCS - telemetry_main.c) + telemetry_main.c +) + +set(${MODULE_PREFIX}_LIBS + freerdp +) add_channel_server_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "DVCPluginEntry") - -target_link_libraries(${MODULE_NAME} freerdp) -set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Server")