mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[channels] simplified client linking

Browse Source
This commit is contained in:
akallabeth 2023-02-20 10:24:38 +01:00 committed by akallabeth
parent 0307482506
commit c3a82daad6
25 changed files with 139 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
channels/CMakeLists.txt
View File

@ -186,15 +186,14 @@ macro(add_channel_client_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})
if (${${_module_prefix}_LIBS})
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}/Client")
if (${_module_prefix}_LIBS)
target_link_libraries(${_module_name} PRIVATE ${${_module_prefix}_LIBS})
endif()
if (NOT BUILD_SHARED_LIBS)
client_channel_install(${_module_name} ${FREERDP_ADDIN_PATH})
endif()
endmacro(add_channel_client_library)
macro(add_channel_client_subsystem_library _module_prefix _module_name _channel_name _type _dynamic _entry)

10
channels/ainput/client/CMakeLists.txt
View File

@ -20,11 +20,13 @@ define_channel_client("ainput")
set(${MODULE_PREFIX}_SRCS
ainput_main.c
ainput_main.h)
ainput_main.h
)
set(${MODULE_PREFIX}_LIBS
winpr
)
include_directories(..)
add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DVCPluginEntry")
target_link_libraries(${MODULE_NAME} winpr)
set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client")

11
channels/audin/client/CMakeLists.txt
View File

@ -19,16 +19,17 @@ define_channel_client("audin")
set(${MODULE_PREFIX}_SRCS
audin_main.c
audin_main.h)
audin_main.h
)
set(${MODULE_PREFIX}_LIBS
freerdp winpr
)
include_directories(..)
add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DVCPluginEntry")
target_link_libraries(${MODULE_NAME} freerdp winpr)
set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client")
if(WITH_OSS)
add_channel_client_subsystem(${MODULE_PREFIX} ${CHANNEL_NAME} "oss" "")
endif()

9
channels/cliprdr/client/CMakeLists.txt
View File

@ -24,10 +24,9 @@ set(${MODULE_PREFIX}_SRCS
cliprdr_main.h
../cliprdr_common.h
../cliprdr_common.c
)
)
set(${MODULE_PREFIX}_LIBS
winpr freerdp
)
add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "VirtualChannelEntryEx")
set(${MODULE_PREFIX}_LIBS freerdp winpr)
set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client")

14
channels/disp/client/CMakeLists.txt
View File

@ -21,16 +21,12 @@ set(${MODULE_PREFIX}_SRCS
disp_main.c
disp_main.h
../disp_common.c
../disp_common.h)
../disp_common.h
)
set(${MODULE_PREFIX}_LIBS
winpr
)
include_directories(..)
add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DVCPluginEntry")
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}/Client")

6
channels/drdynvc/client/CMakeLists.txt
View File

@ -19,9 +19,7 @@ define_channel_client("drdynvc")
set(${MODULE_PREFIX}_SRCS
drdynvc_main.c
drdynvc_main.h)
drdynvc_main.h
)
add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "VirtualChannelEntryEx")
set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client")

10
channels/drive/client/CMakeLists.txt
View File

@ -20,10 +20,10 @@ define_channel_client("drive")
set(${MODULE_PREFIX}_SRCS
drive_file.c
drive_file.h
drive_main.c)
drive_main.c
)
set(${MODULE_PREFIX}_LIBS
winpr freerdp
)
add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DeviceServiceEntry")
target_link_libraries(${MODULE_NAME} winpr freerdp)
set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client")

9
channels/echo/client/CMakeLists.txt
View File

@ -19,11 +19,12 @@ define_channel_client("echo")
set(${MODULE_PREFIX}_SRCS
echo_main.c
echo_main.h)
echo_main.h
)
set(${MODULE_PREFIX}_LIBS
winpr
)
include_directories(..)
add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DVCPluginEntry")
target_link_libraries(${MODULE_NAME} winpr)
set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client")

6
channels/encomsp/client/CMakeLists.txt
View File

@ -21,9 +21,7 @@ include_directories(..)
set(${MODULE_PREFIX}_SRCS
encomsp_main.c
encomsp_main.h)
encomsp_main.h
)
add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "VirtualChannelEntryEx")
set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client")

16
channels/geometry/client/CMakeLists.txt
View File

@ -19,17 +19,13 @@ define_channel_client("geometry")
set(${MODULE_PREFIX}_SRCS
geometry_main.c
geometry_main.h)
geometry_main.h
)
set(${MODULE_PREFIX}_LIBS
winpr
)
include_directories(..)
add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DVCPluginEntry")
set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr)
if (NOT BUILD_SHARED_LIBS)
set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp-client)
endif()
target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client")

10
channels/parallel/client/CMakeLists.txt
View File

@ -18,10 +18,10 @@
define_channel_client("parallel")
set(${MODULE_PREFIX}_SRCS
parallel_main.c)
parallel_main.c
)
set(${MODULE_PREFIX}_LIBS
winpr freerdp
)
add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DeviceServiceEntry")
target_link_libraries(${MODULE_NAME} freerdp winpr)
set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client")

15
channels/printer/client/CMakeLists.txt
View File

@ -18,19 +18,18 @@
define_channel_client("printer")
set(${MODULE_PREFIX}_SRCS
printer_main.c)
printer_main.c
)
set(${MODULE_PREFIX}_LIBS
winpr freerdp
)
add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DeviceServiceEntry")
set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr freerdp)
target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client")
if(WITH_CUPS)
add_channel_client_subsystem(${MODULE_PREFIX} ${CHANNEL_NAME} "cups" "")
add_channel_client_subsystem(${MODULE_PREFIX} ${CHANNEL_NAME} "cups" "")
endif()
if(WIN32 AND NOT UWP)
add_channel_client_subsystem(${MODULE_PREFIX} ${CHANNEL_NAME} "win" "")
add_channel_client_subsystem(${MODULE_PREFIX} ${CHANNEL_NAME} "win" "")
endif()

17
channels/rail/client/CMakeLists.txt
View File

@ -18,18 +18,15 @@
define_channel_client("rail")
set(${MODULE_PREFIX}_SRCS
../rail_common.h
../rail_common.c
../rail_common.h
../rail_common.c
rail_main.c
rail_main.h
rail_orders.c
rail_orders.h)
rail_orders.h
)
set(${MODULE_PREFIX}_LIBS
freerdp
)
add_channel_client_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}/Client")

10
channels/rdp2tcp/client/CMakeLists.txt
View File

@ -18,10 +18,10 @@
define_channel_client("rdp2tcp")
set(${MODULE_PREFIX}_SRCS
rdp2tcp_main.c)
rdp2tcp_main.c
)
set(${MODULE_PREFIX}_LIBS
freerdp
)
add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "VirtualChannelEntryEx")
target_link_libraries(${MODULE_NAME} freerdp)
set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client")

19
channels/rdpdr/client/CMakeLists.txt
View File

@ -27,17 +27,16 @@ set(${MODULE_PREFIX}_SRCS
rdpdr_main.c
rdpdr_main.h
rdpdr_capabilities.c
rdpdr_capabilities.h)
rdpdr_capabilities.h
)
add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "VirtualChannelEntryEx")
target_link_libraries(${MODULE_NAME} winpr freerdp)
set(${MODULE_PREFIX}_LIBS
winpr freerdp
)
if(APPLE AND (NOT IOS))
find_library(CORESERVICES_LIBRARY CoreServices)
target_link_libraries(${MODULE_NAME} ${CORESERVICES_LIBRARY})
list(APPEND ${MODULE_PREFIX}_LIBS
${CORESERVICES_LIBRARY}
)
endif()
set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client")
add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "VirtualChannelEntryEx")

11
channels/rdpei/client/CMakeLists.txt
View File

@ -21,11 +21,12 @@ set(${MODULE_PREFIX}_SRCS
rdpei_main.c
rdpei_main.h
../rdpei_common.c
../rdpei_common.h)
../rdpei_common.h
)
set(${MODULE_PREFIX}_LIBS
winpr freerdp
)
include_directories(..)
add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DVCPluginEntry")
target_link_libraries(${MODULE_NAME} winpr freerdp)
set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client")

10
channels/rdpgfx/client/CMakeLists.txt
View File

@ -23,13 +23,13 @@ set(${MODULE_PREFIX}_SRCS
rdpgfx_codec.c
rdpgfx_codec.h
../rdpgfx_common.c
../rdpgfx_common.h)
../rdpgfx_common.h
)
set(${MODULE_PREFIX}_LIBS
winpr freerdp
)
include_directories(..)
add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DVCPluginEntry")
target_link_libraries(${MODULE_NAME} winpr freerdp)
set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client")

9
channels/rdpsnd/client/CMakeLists.txt
View File

@ -19,15 +19,14 @@ define_channel_client("rdpsnd")
set(${MODULE_PREFIX}_SRCS
rdpsnd_main.c
rdpsnd_main.h)
rdpsnd_main.h
)
add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "VirtualChannelEntryEx;DVCPluginEntry")
target_link_libraries(${MODULE_NAME}
set(${MODULE_PREFIX}_LIBS
winpr freerdp ${CMAKE_THREAD_LIBS_INIT} rdpsnd-common
)
set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client")
add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "VirtualChannelEntryEx;DVCPluginEntry")
if(WITH_OSS)
add_channel_client_subsystem(${MODULE_PREFIX} ${CHANNEL_NAME} "oss" "")

14
channels/remdesk/client/CMakeLists.txt
View File

@ -19,13 +19,11 @@ define_channel_client("remdesk")
set(${MODULE_PREFIX}_SRCS
remdesk_main.c
remdesk_main.h)
remdesk_main.h
)
set(${MODULE_PREFIX}_LIBS
winpr freerdp
)
add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "VirtualChannelEntryEx")
set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr freerdp)
set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client")

10
channels/serial/client/CMakeLists.txt
View File

@ -18,10 +18,10 @@
define_channel_client("serial")
set(${MODULE_PREFIX}_SRCS
serial_main.c)
serial_main.c
)
set(${MODULE_PREFIX}_LIBS
winpr freerdp
)
add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DeviceServiceEntry")
target_link_libraries(${MODULE_NAME} winpr freerdp)
set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client")

18
channels/smartcard/client/CMakeLists.txt
View File

@ -19,15 +19,15 @@ define_channel_client("smartcard")
set(${MODULE_PREFIX}_SRCS
smartcard_main.c
smartcard_main.h
)
smartcard_main.h
)
add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "DeviceServiceEntry")
target_link_libraries(${MODULE_NAME} winpr freerdp ${OPENSSL_LIBRARIES})
set(${MODULE_PREFIX}_LIBS
winpr freerdp ${OPENSSL_LIBRARIES}
)
if (WITH_SMARTCARD_EMULATE)
target_link_libraries(${MODULE_NAME} ZLIB::ZLIB)
list(APPEND ${MODULE_PREFIX}_LIBS
ZLIB::ZLIB
)
endif()
set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client")
add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "DeviceServiceEntry")

10
channels/sshagent/client/CMakeLists.txt
View File

@ -20,11 +20,13 @@ define_channel_client("sshagent")
set(${MODULE_PREFIX}_SRCS
sshagent_main.c
sshagent_main.h)
sshagent_main.h
)
set(${MODULE_PREFIX}_LIBS
winpr
)
include_directories(..)
add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DVCPluginEntry")
target_link_libraries(${MODULE_NAME} winpr)
set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client")

12
channels/tsmf/client/CMakeLists.txt
View File

@ -69,18 +69,16 @@ set(${MODULE_PREFIX}_SRCS
tsmf_main.h
tsmf_media.c
tsmf_media.h
tsmf_types.h)
tsmf_types.h
)
set(${MODULE_PREFIX}_LIBS
winpr freerdp
)
include_directories(..)
add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DVCPluginEntry")
target_link_libraries(${MODULE_NAME} freerdp winpr)
set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client")
if(WITH_VIDEO_FFMPEG)
add_channel_client_subsystem(${MODULE_PREFIX} ${CHANNEL_NAME} "ffmpeg" "decoder")
endif()

22
channels/urbdrc/client/CMakeLists.txt
View File

@ -23,21 +23,17 @@ set(${MODULE_PREFIX}_SRCS
data_transfer.h
urbdrc_main.c
urbdrc_main.h
$<TARGET_OBJECTS:urbdrc-common>
)
)
set(${MODULE_PREFIX}_LIBS
winpr freerdp
$<TARGET_OBJECTS:urbdrc-common>
)
if (UDEV_FOUND AND UDEV_LIBRARIES)
list(APPEND ${MODULE_PREFIX}_LIBS ${UDEV_LIBRARIES})
endif()
add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DVCPluginEntry")
set(${MODULE_PREFIX}_LIBS)
if (UDEV_FOUND AND UDEV_LIBRARIES)
set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} ${UDEV_LIBRARIES})
endif()
set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr freerdp)
target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWOARD} ${${MODULE_PREFIX}_LIBS})
set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client")
# libusb subsystem
add_channel_client_subsystem(${MODULE_PREFIX} ${CHANNEL_NAME} "libusb" "")

12
channels/video/client/CMakeLists.txt
View File

@ -19,14 +19,12 @@ define_channel_client("video")
set(${MODULE_PREFIX}_SRCS
video_main.c
video_main.h)
video_main.h
)
set(${MODULE_PREFIX}_LIBS
winpr
)
include_directories(..)
add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DVCPluginEntry")
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}/Client")