From 059374457d801351d02ac81badb4aabbfa7689e7 Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Mon, 15 Sep 2014 10:30:07 +0200 Subject: [PATCH] Removed library prefix override. --- channels/audin/client/CMakeLists.txt | 2 +- channels/audin/client/alsa/CMakeLists.txt | 2 +- channels/audin/client/opensles/CMakeLists.txt | 2 +- channels/audin/client/pulse/CMakeLists.txt | 2 +- channels/audin/client/winmm/CMakeLists.txt | 2 +- channels/audin/server/CMakeLists.txt | 2 +- channels/cliprdr/client/CMakeLists.txt | 2 +- channels/cliprdr/server/CMakeLists.txt | 2 +- channels/disp/client/CMakeLists.txt | 2 +- channels/drdynvc/client/CMakeLists.txt | 2 +- channels/drdynvc/server/CMakeLists.txt | 2 +- channels/drive/client/CMakeLists.txt | 2 +- channels/echo/client/CMakeLists.txt | 2 +- channels/echo/server/CMakeLists.txt | 2 +- channels/encomsp/client/CMakeLists.txt | 2 +- channels/encomsp/server/CMakeLists.txt | 2 +- channels/parallel/client/CMakeLists.txt | 2 +- channels/printer/client/CMakeLists.txt | 2 +- channels/rail/client/CMakeLists.txt | 2 +- channels/rdpdr/client/CMakeLists.txt | 2 +- channels/rdpdr/server/CMakeLists.txt | 2 +- channels/rdpei/client/CMakeLists.txt | 2 +- channels/rdpgfx/client/CMakeLists.txt | 2 +- channels/rdpsnd/client/CMakeLists.txt | 2 +- channels/rdpsnd/client/alsa/CMakeLists.txt | 2 +- channels/rdpsnd/client/ios/CMakeLists.txt | 2 +- channels/rdpsnd/client/mac/CMakeLists.txt | 2 +- channels/rdpsnd/client/opensles/CMakeLists.txt | 2 +- channels/rdpsnd/client/pulse/CMakeLists.txt | 2 +- channels/rdpsnd/client/winmm/CMakeLists.txt | 2 +- channels/rdpsnd/server/CMakeLists.txt | 2 +- channels/remdesk/client/CMakeLists.txt | 2 +- channels/remdesk/server/CMakeLists.txt | 2 +- channels/serial/client/CMakeLists.txt | 2 +- channels/server/CMakeLists.txt | 2 +- channels/smartcard/client/CMakeLists.txt | 2 +- channels/tsmf/client/CMakeLists.txt | 2 +- channels/tsmf/client/alsa/CMakeLists.txt | 2 +- channels/tsmf/client/ffmpeg/CMakeLists.txt | 2 +- channels/tsmf/client/gstreamer/CMakeLists.txt | 2 +- channels/tsmf/client/pulse/CMakeLists.txt | 2 +- channels/urbdrc/client/CMakeLists.txt | 2 +- channels/urbdrc/client/libusb/CMakeLists.txt | 2 +- client/Windows/CMakeLists.txt | 2 +- client/X11/CMakeLists.txt | 2 +- client/common/CMakeLists.txt | 2 +- libfreerdp/CMakeLists.txt | 2 +- server/Windows/CMakeLists.txt | 2 +- server/common/CMakeLists.txt | 2 +- winpr/libwinpr/CMakeLists.txt | 2 +- winpr/libwinpr/library/test/TestLibraryA/CMakeLists.txt | 2 +- winpr/libwinpr/library/test/TestLibraryB/CMakeLists.txt | 2 +- 52 files changed, 52 insertions(+), 52 deletions(-) diff --git a/channels/audin/client/CMakeLists.txt b/channels/audin/client/CMakeLists.txt index 52b73e12e..07e6df705 100644 --- a/channels/audin/client/CMakeLists.txt +++ b/channels/audin/client/CMakeLists.txt @@ -25,7 +25,7 @@ include_directories(..) add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DVCPluginEntry") -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") + target_link_libraries(${MODULE_NAME} freerdp) diff --git a/channels/audin/client/alsa/CMakeLists.txt b/channels/audin/client/alsa/CMakeLists.txt index 892a263d2..46c756bc7 100644 --- a/channels/audin/client/alsa/CMakeLists.txt +++ b/channels/audin/client/alsa/CMakeLists.txt @@ -25,7 +25,7 @@ include_directories(${ALSA_INCLUDE_DIRS}) add_channel_client_subsystem_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} "" TRUE "") -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") + set(${MODULE_PREFIX}_LIBS freerdp ${ALSA_LIBRARIES}) diff --git a/channels/audin/client/opensles/CMakeLists.txt b/channels/audin/client/opensles/CMakeLists.txt index cd34e712b..8844c22ec 100644 --- a/channels/audin/client/opensles/CMakeLists.txt +++ b/channels/audin/client/opensles/CMakeLists.txt @@ -26,7 +26,7 @@ include_directories(${OPENSLES_INCLUDE_DIRS}) add_channel_client_subsystem_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} "" TRUE "") -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") + set(${MODULE_PREFIX}_LIBS freerdp ${OPENSLES_LIBRARIES}) diff --git a/channels/audin/client/pulse/CMakeLists.txt b/channels/audin/client/pulse/CMakeLists.txt index bdbaa5b5f..5047aaef5 100644 --- a/channels/audin/client/pulse/CMakeLists.txt +++ b/channels/audin/client/pulse/CMakeLists.txt @@ -25,7 +25,7 @@ include_directories(${PULSE_INCLUDE_DIR}) add_channel_client_subsystem_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} "" TRUE "") -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") + set(${MODULE_PREFIX}_LIBS freerdp ${PULSE_LIBRARY}) diff --git a/channels/audin/client/winmm/CMakeLists.txt b/channels/audin/client/winmm/CMakeLists.txt index f4adaddc7..a71f1c6d8 100644 --- a/channels/audin/client/winmm/CMakeLists.txt +++ b/channels/audin/client/winmm/CMakeLists.txt @@ -24,7 +24,7 @@ include_directories(..) add_channel_client_subsystem_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} "" TRUE "") -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") + set(${MODULE_PREFIX}_LIBS freerdp winmm.lib) diff --git a/channels/audin/server/CMakeLists.txt b/channels/audin/server/CMakeLists.txt index c093ec538..7f5308957 100644 --- a/channels/audin/server/CMakeLists.txt +++ b/channels/audin/server/CMakeLists.txt @@ -22,7 +22,7 @@ set(${MODULE_PREFIX}_SRCS add_channel_server_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "DVCPluginEntry") -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") + target_link_libraries(${MODULE_NAME} freerdp) diff --git a/channels/cliprdr/client/CMakeLists.txt b/channels/cliprdr/client/CMakeLists.txt index e23861515..99f3b6621 100644 --- a/channels/cliprdr/client/CMakeLists.txt +++ b/channels/cliprdr/client/CMakeLists.txt @@ -25,7 +25,7 @@ set(${MODULE_PREFIX}_SRCS add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "VirtualChannelEntry") -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") + set(${MODULE_PREFIX}_LIBS freerdp winpr) diff --git a/channels/cliprdr/server/CMakeLists.txt b/channels/cliprdr/server/CMakeLists.txt index 0375f6d53..41d993236 100644 --- a/channels/cliprdr/server/CMakeLists.txt +++ b/channels/cliprdr/server/CMakeLists.txt @@ -23,7 +23,7 @@ set(${MODULE_PREFIX}_SRCS add_channel_server_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "VirtualChannelEntry") -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") + target_link_libraries(${MODULE_NAME} freerdp) diff --git a/channels/disp/client/CMakeLists.txt b/channels/disp/client/CMakeLists.txt index 328dc3cb6..f5072e5d9 100644 --- a/channels/disp/client/CMakeLists.txt +++ b/channels/disp/client/CMakeLists.txt @@ -25,7 +25,7 @@ include_directories(..) add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DVCPluginEntry") -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") + set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr freerdp) diff --git a/channels/drdynvc/client/CMakeLists.txt b/channels/drdynvc/client/CMakeLists.txt index 27e45a547..937825a67 100644 --- a/channels/drdynvc/client/CMakeLists.txt +++ b/channels/drdynvc/client/CMakeLists.txt @@ -26,7 +26,7 @@ set(${MODULE_PREFIX}_SRCS add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "VirtualChannelEntry") -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") + install(TARGETS ${MODULE_NAME} DESTINATION ${FREERDP_ADDIN_PATH} EXPORT FreeRDPTargets) diff --git a/channels/drdynvc/server/CMakeLists.txt b/channels/drdynvc/server/CMakeLists.txt index 4e09ba49d..4729a8287 100644 --- a/channels/drdynvc/server/CMakeLists.txt +++ b/channels/drdynvc/server/CMakeLists.txt @@ -23,7 +23,7 @@ set(${MODULE_PREFIX}_SRCS add_channel_server_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "VirtualChannelEntry") -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") + target_link_libraries(${MODULE_NAME} freerdp) diff --git a/channels/drive/client/CMakeLists.txt b/channels/drive/client/CMakeLists.txt index eb09d1a91..a9e0c2631 100644 --- a/channels/drive/client/CMakeLists.txt +++ b/channels/drive/client/CMakeLists.txt @@ -31,7 +31,7 @@ endif() add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DeviceServiceEntry") -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") + target_link_libraries(${MODULE_NAME} winpr freerdp) diff --git a/channels/echo/client/CMakeLists.txt b/channels/echo/client/CMakeLists.txt index 47ac1bf8d..9db6718bf 100644 --- a/channels/echo/client/CMakeLists.txt +++ b/channels/echo/client/CMakeLists.txt @@ -25,7 +25,7 @@ include_directories(..) add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DVCPluginEntry") -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") + target_link_libraries(${MODULE_NAME} freerdp) diff --git a/channels/echo/server/CMakeLists.txt b/channels/echo/server/CMakeLists.txt index 8a90d903a..4fcf3a3b8 100644 --- a/channels/echo/server/CMakeLists.txt +++ b/channels/echo/server/CMakeLists.txt @@ -22,7 +22,7 @@ set(${MODULE_PREFIX}_SRCS add_channel_server_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "DVCPluginEntry") -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") + target_link_libraries(${MODULE_NAME} freerdp) diff --git a/channels/encomsp/client/CMakeLists.txt b/channels/encomsp/client/CMakeLists.txt index 8842e5969..f4d0e4c70 100644 --- a/channels/encomsp/client/CMakeLists.txt +++ b/channels/encomsp/client/CMakeLists.txt @@ -25,7 +25,7 @@ set(${MODULE_PREFIX}_SRCS add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "VirtualChannelEntry") -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") + set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr) diff --git a/channels/encomsp/server/CMakeLists.txt b/channels/encomsp/server/CMakeLists.txt index 4cb47966e..24246268d 100644 --- a/channels/encomsp/server/CMakeLists.txt +++ b/channels/encomsp/server/CMakeLists.txt @@ -25,7 +25,7 @@ set(${MODULE_PREFIX}_SRCS add_channel_server_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "VirtualChannelEntry") -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") + set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr) diff --git a/channels/parallel/client/CMakeLists.txt b/channels/parallel/client/CMakeLists.txt index 91f649a0b..6966ed5ea 100644 --- a/channels/parallel/client/CMakeLists.txt +++ b/channels/parallel/client/CMakeLists.txt @@ -22,7 +22,7 @@ set(${MODULE_PREFIX}_SRCS add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DeviceServiceEntry") -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") + target_link_libraries(${MODULE_NAME} freerdp winpr) diff --git a/channels/printer/client/CMakeLists.txt b/channels/printer/client/CMakeLists.txt index f8bee2e36..0d43436c2 100644 --- a/channels/printer/client/CMakeLists.txt +++ b/channels/printer/client/CMakeLists.txt @@ -38,7 +38,7 @@ endif() add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DeviceServiceEntry") -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") + set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr freerdp) diff --git a/channels/rail/client/CMakeLists.txt b/channels/rail/client/CMakeLists.txt index e6b1bc4f8..111e59263 100644 --- a/channels/rail/client/CMakeLists.txt +++ b/channels/rail/client/CMakeLists.txt @@ -27,7 +27,7 @@ set(${MODULE_PREFIX}_SRCS add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "VirtualChannelEntry") -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") + target_link_libraries(${MODULE_NAME} freerdp) diff --git a/channels/rdpdr/client/CMakeLists.txt b/channels/rdpdr/client/CMakeLists.txt index 39e05a505..884bf98be 100644 --- a/channels/rdpdr/client/CMakeLists.txt +++ b/channels/rdpdr/client/CMakeLists.txt @@ -29,7 +29,7 @@ set(${MODULE_PREFIX}_SRCS add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "VirtualChannelEntry") -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") + target_link_libraries(${MODULE_NAME} winpr freerdp) diff --git a/channels/rdpdr/server/CMakeLists.txt b/channels/rdpdr/server/CMakeLists.txt index 32529e5bf..e5a98cb64 100644 --- a/channels/rdpdr/server/CMakeLists.txt +++ b/channels/rdpdr/server/CMakeLists.txt @@ -23,7 +23,7 @@ set(${MODULE_PREFIX}_SRCS add_channel_server_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "VirtualChannelEntry") -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") + target_link_libraries(${MODULE_NAME} freerdp) diff --git a/channels/rdpei/client/CMakeLists.txt b/channels/rdpei/client/CMakeLists.txt index c792e3716..db3794621 100644 --- a/channels/rdpei/client/CMakeLists.txt +++ b/channels/rdpei/client/CMakeLists.txt @@ -27,7 +27,7 @@ include_directories(..) add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DVCPluginEntry") -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") + target_link_libraries(${MODULE_NAME} winpr freerdp) diff --git a/channels/rdpgfx/client/CMakeLists.txt b/channels/rdpgfx/client/CMakeLists.txt index 06fe351ec..c06274d7a 100644 --- a/channels/rdpgfx/client/CMakeLists.txt +++ b/channels/rdpgfx/client/CMakeLists.txt @@ -29,7 +29,7 @@ include_directories(..) add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DVCPluginEntry") -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") + target_link_libraries(${MODULE_NAME} winpr freerdp) diff --git a/channels/rdpsnd/client/CMakeLists.txt b/channels/rdpsnd/client/CMakeLists.txt index 53d16e832..de35d77f7 100644 --- a/channels/rdpsnd/client/CMakeLists.txt +++ b/channels/rdpsnd/client/CMakeLists.txt @@ -23,7 +23,7 @@ set(${MODULE_PREFIX}_SRCS add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "VirtualChannelEntry") -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") + target_link_libraries(${MODULE_NAME} winpr freerdp) diff --git a/channels/rdpsnd/client/alsa/CMakeLists.txt b/channels/rdpsnd/client/alsa/CMakeLists.txt index 411ca642c..cdbce489d 100644 --- a/channels/rdpsnd/client/alsa/CMakeLists.txt +++ b/channels/rdpsnd/client/alsa/CMakeLists.txt @@ -25,7 +25,7 @@ include_directories(${ALSA_INCLUDE_DIRS}) add_channel_client_subsystem_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} "" TRUE "") -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") + set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr freerdp) diff --git a/channels/rdpsnd/client/ios/CMakeLists.txt b/channels/rdpsnd/client/ios/CMakeLists.txt index 0190a6b7a..b9a961714 100644 --- a/channels/rdpsnd/client/ios/CMakeLists.txt +++ b/channels/rdpsnd/client/ios/CMakeLists.txt @@ -31,7 +31,7 @@ include_directories(..) add_channel_client_subsystem_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} "" TRUE "") -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") + set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} ${AUDIO_TOOL} diff --git a/channels/rdpsnd/client/mac/CMakeLists.txt b/channels/rdpsnd/client/mac/CMakeLists.txt index 103c40665..035d16cb4 100644 --- a/channels/rdpsnd/client/mac/CMakeLists.txt +++ b/channels/rdpsnd/client/mac/CMakeLists.txt @@ -31,7 +31,7 @@ include_directories(${MACAUDIO_INCLUDE_DIRS}) add_channel_client_subsystem_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} "" TRUE "") -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") + set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} ${AUDIO_TOOL} diff --git a/channels/rdpsnd/client/opensles/CMakeLists.txt b/channels/rdpsnd/client/opensles/CMakeLists.txt index 9060761bf..7153eed82 100644 --- a/channels/rdpsnd/client/opensles/CMakeLists.txt +++ b/channels/rdpsnd/client/opensles/CMakeLists.txt @@ -26,7 +26,7 @@ include_directories(${OPENSLES_INCLUDE_DIRS}) add_channel_client_subsystem_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} "" TRUE "") -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") + set(${MODULE_PREFIX}_LIBS freerdp ${OPENSLES_LIBRARIES}) diff --git a/channels/rdpsnd/client/pulse/CMakeLists.txt b/channels/rdpsnd/client/pulse/CMakeLists.txt index 46d525749..79095223e 100644 --- a/channels/rdpsnd/client/pulse/CMakeLists.txt +++ b/channels/rdpsnd/client/pulse/CMakeLists.txt @@ -25,7 +25,7 @@ include_directories(${PULSE_INCLUDE_DIR}) add_channel_client_subsystem_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} "" TRUE "") -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") + list(APPEND ${MODULE_PREFIX}_LIBS ${PULSE_LIBRARY}) list(APPEND ${MODULE_PREFIX}_LIBS freerdp) diff --git a/channels/rdpsnd/client/winmm/CMakeLists.txt b/channels/rdpsnd/client/winmm/CMakeLists.txt index 2c670c3ba..11fa19026 100644 --- a/channels/rdpsnd/client/winmm/CMakeLists.txt +++ b/channels/rdpsnd/client/winmm/CMakeLists.txt @@ -24,7 +24,7 @@ include_directories(..) add_channel_client_subsystem_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} "" TRUE "") -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") + set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr) set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winmm.lib) diff --git a/channels/rdpsnd/server/CMakeLists.txt b/channels/rdpsnd/server/CMakeLists.txt index 09fef66e3..afdd9db56 100644 --- a/channels/rdpsnd/server/CMakeLists.txt +++ b/channels/rdpsnd/server/CMakeLists.txt @@ -23,7 +23,7 @@ set(${MODULE_PREFIX}_SRCS add_channel_server_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "VirtualChannelEntry") -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") + target_link_libraries(${MODULE_NAME} freerdp) diff --git a/channels/remdesk/client/CMakeLists.txt b/channels/remdesk/client/CMakeLists.txt index ed90b2948..570c5e62c 100644 --- a/channels/remdesk/client/CMakeLists.txt +++ b/channels/remdesk/client/CMakeLists.txt @@ -23,7 +23,7 @@ set(${MODULE_PREFIX}_SRCS add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "VirtualChannelEntry") -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") + set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr freerdp) diff --git a/channels/remdesk/server/CMakeLists.txt b/channels/remdesk/server/CMakeLists.txt index c20bd0618..dad21c276 100644 --- a/channels/remdesk/server/CMakeLists.txt +++ b/channels/remdesk/server/CMakeLists.txt @@ -23,7 +23,7 @@ set(${MODULE_PREFIX}_SRCS add_channel_server_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "VirtualChannelEntry") -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") + set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr) diff --git a/channels/serial/client/CMakeLists.txt b/channels/serial/client/CMakeLists.txt index 1a40d472a..3ca69cc89 100644 --- a/channels/serial/client/CMakeLists.txt +++ b/channels/serial/client/CMakeLists.txt @@ -22,7 +22,7 @@ set(${MODULE_PREFIX}_SRCS add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DeviceServiceEntry") -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") + target_link_libraries(${MODULE_NAME} winpr freerdp) diff --git a/channels/server/CMakeLists.txt b/channels/server/CMakeLists.txt index 4723368cb..2aa09b27b 100644 --- a/channels/server/CMakeLists.txt +++ b/channels/server/CMakeLists.txt @@ -33,7 +33,7 @@ add_library(${MODULE_NAME} STATIC ${${MODULE_PREFIX}_SRCS}) if (WITH_LIBRARY_VERSIONING) set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION}) endif() -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "lib") + set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr freerdp) diff --git a/channels/smartcard/client/CMakeLists.txt b/channels/smartcard/client/CMakeLists.txt index b38464cc0..05e4405c9 100644 --- a/channels/smartcard/client/CMakeLists.txt +++ b/channels/smartcard/client/CMakeLists.txt @@ -26,7 +26,7 @@ set(${MODULE_PREFIX}_SRCS add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "DeviceServiceEntry") -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") + target_link_libraries(${MODULE_NAME} winpr freerdp) diff --git a/channels/tsmf/client/CMakeLists.txt b/channels/tsmf/client/CMakeLists.txt index 1e0751993..78a201506 100644 --- a/channels/tsmf/client/CMakeLists.txt +++ b/channels/tsmf/client/CMakeLists.txt @@ -38,7 +38,7 @@ include_directories(..) add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DVCPluginEntry") -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") + target_link_libraries(${MODULE_NAME} freerdp) diff --git a/channels/tsmf/client/alsa/CMakeLists.txt b/channels/tsmf/client/alsa/CMakeLists.txt index 143a69be9..0466de04c 100644 --- a/channels/tsmf/client/alsa/CMakeLists.txt +++ b/channels/tsmf/client/alsa/CMakeLists.txt @@ -25,7 +25,7 @@ include_directories(${ALSA_INCLUDE_DIRS}) add_channel_client_subsystem_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} "" TRUE "") -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") + target_link_libraries(${MODULE_NAME} freerdp ${ALSA_LIBRARIES}) diff --git a/channels/tsmf/client/ffmpeg/CMakeLists.txt b/channels/tsmf/client/ffmpeg/CMakeLists.txt index d381cd97b..96c3efb4b 100644 --- a/channels/tsmf/client/ffmpeg/CMakeLists.txt +++ b/channels/tsmf/client/ffmpeg/CMakeLists.txt @@ -25,7 +25,7 @@ include_directories(${FFMPEG_INCLUDE_DIRS}) add_channel_client_subsystem_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} "" TRUE "") -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") + if(APPLE) # For this to work on apple, we need to add some frameworks diff --git a/channels/tsmf/client/gstreamer/CMakeLists.txt b/channels/tsmf/client/gstreamer/CMakeLists.txt index ee07c947c..766c9e958 100644 --- a/channels/tsmf/client/gstreamer/CMakeLists.txt +++ b/channels/tsmf/client/gstreamer/CMakeLists.txt @@ -62,7 +62,7 @@ include_directories(..) add_channel_client_subsystem_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} "" TRUE "") -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") + target_link_libraries(${MODULE_NAME} ${LIBS} freerdp) diff --git a/channels/tsmf/client/pulse/CMakeLists.txt b/channels/tsmf/client/pulse/CMakeLists.txt index f0cf8abd9..a93854a53 100644 --- a/channels/tsmf/client/pulse/CMakeLists.txt +++ b/channels/tsmf/client/pulse/CMakeLists.txt @@ -25,7 +25,7 @@ include_directories(${PULSE_INCLUDE_DIR}) add_channel_client_subsystem_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} "" TRUE "") -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") + target_link_libraries(${MODULE_NAME} freerdp) diff --git a/channels/urbdrc/client/CMakeLists.txt b/channels/urbdrc/client/CMakeLists.txt index 4d5069f93..4ad1f27c0 100644 --- a/channels/urbdrc/client/CMakeLists.txt +++ b/channels/urbdrc/client/CMakeLists.txt @@ -33,7 +33,7 @@ include_directories(..) add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DVCPluginEntry") -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") + #set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} libusb-devman) diff --git a/channels/urbdrc/client/libusb/CMakeLists.txt b/channels/urbdrc/client/libusb/CMakeLists.txt index 6770be4b7..696523d17 100644 --- a/channels/urbdrc/client/libusb/CMakeLists.txt +++ b/channels/urbdrc/client/libusb/CMakeLists.txt @@ -29,7 +29,7 @@ include_directories(..) add_channel_client_subsystem_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} "" TRUE "") -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") + set(${MODULE_PREFIX}_LIBS ${CMAKE_THREAD_LIBS_INIT}) diff --git a/client/Windows/CMakeLists.txt b/client/Windows/CMakeLists.txt index 5de11bd9f..1e487b245 100644 --- a/client/Windows/CMakeLists.txt +++ b/client/Windows/CMakeLists.txt @@ -53,7 +53,7 @@ if(WITH_CLIENT_INTERFACE) if (WITH_LIBRARY_VERSIONING) set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION}) endif() - set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "lib") + else() set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} cli/wfreerdp.c cli/wfreerdp.h) add_executable(${MODULE_NAME} WIN32 ${${MODULE_PREFIX}_SRCS}) diff --git a/client/X11/CMakeLists.txt b/client/X11/CMakeLists.txt index a6bd5b5cf..7bbde354e 100644 --- a/client/X11/CMakeLists.txt +++ b/client/X11/CMakeLists.txt @@ -62,7 +62,7 @@ if(WITH_CLIENT_INTERFACE) if (WITH_LIBRARY_VERSIONING) set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION}) endif() - set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "lib") + else() set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} cli/xfreerdp.c cli/xfreerdp.h) add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS}) diff --git a/client/common/CMakeLists.txt b/client/common/CMakeLists.txt index 5ac33ff2a..5194c2fda 100644 --- a/client/common/CMakeLists.txt +++ b/client/common/CMakeLists.txt @@ -50,7 +50,7 @@ include_directories(${ZLIB_INCLUDE_DIRS}) if (WITH_LIBRARY_VERSIONING) set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION}) endif() -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "lib") + set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} ${FREERDP_CHANNELS_CLIENT_LIBS}) diff --git a/libfreerdp/CMakeLists.txt b/libfreerdp/CMakeLists.txt index 54bc042e1..ec0095fff 100644 --- a/libfreerdp/CMakeLists.txt +++ b/libfreerdp/CMakeLists.txt @@ -282,7 +282,7 @@ set_target_properties(${MODULE_NAME} PROPERTIES LINKER_LANGUAGE C) if (WITH_LIBRARY_VERSIONING) set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION}) endif() -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "lib") + target_link_libraries(${MODULE_NAME} ${LIBFREERDP_LIBS} winpr) install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries EXPORT FreeRDPTargets) diff --git a/server/Windows/CMakeLists.txt b/server/Windows/CMakeLists.txt index 93336a5b6..63d457a5c 100644 --- a/server/Windows/CMakeLists.txt +++ b/server/Windows/CMakeLists.txt @@ -63,7 +63,7 @@ if(WITH_SERVER_INTERFACE) if (WITH_LIBRARY_VERSIONING) set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION}) endif() - set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "lib") + else() set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} cli/wfreerdp.c cli/wfreerdp.h) add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS}) diff --git a/server/common/CMakeLists.txt b/server/common/CMakeLists.txt index 90ac794bd..77b64ba28 100644 --- a/server/common/CMakeLists.txt +++ b/server/common/CMakeLists.txt @@ -35,7 +35,7 @@ add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS}) if (WITH_LIBRARY_VERSIONING) set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION}) endif() -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "lib") + set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} ${FREERDP_CHANNELS_SERVER_LIBS}) diff --git a/winpr/libwinpr/CMakeLists.txt b/winpr/libwinpr/CMakeLists.txt index 0b3c5d7dc..3c4e799c7 100644 --- a/winpr/libwinpr/CMakeLists.txt +++ b/winpr/libwinpr/CMakeLists.txt @@ -99,7 +99,7 @@ set_target_properties(${MODULE_NAME} PROPERTIES LINKER_LANGUAGE C) if (WITH_LIBRARY_VERSIONING) set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION}) endif() -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "lib") + add_definitions(${WINPR_DEFINITIONS}) target_link_libraries(${MODULE_NAME} ${WINPR_LIBS}) install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries EXPORT WinPRTargets) diff --git a/winpr/libwinpr/library/test/TestLibraryA/CMakeLists.txt b/winpr/libwinpr/library/test/TestLibraryA/CMakeLists.txt index 90c3936d0..f5b501d3f 100644 --- a/winpr/libwinpr/library/test/TestLibraryA/CMakeLists.txt +++ b/winpr/libwinpr/library/test/TestLibraryA/CMakeLists.txt @@ -26,7 +26,7 @@ endif() add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS}) -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") + set_target_properties(${MODULE_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${TESTING_OUTPUT_DIRECTORY}/${TEST_AREA}/${MODULE_NAME}") set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR/Test/Extra") diff --git a/winpr/libwinpr/library/test/TestLibraryB/CMakeLists.txt b/winpr/libwinpr/library/test/TestLibraryB/CMakeLists.txt index a90af7f45..780fccaac 100644 --- a/winpr/libwinpr/library/test/TestLibraryB/CMakeLists.txt +++ b/winpr/libwinpr/library/test/TestLibraryB/CMakeLists.txt @@ -26,7 +26,7 @@ endif() add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS}) -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") + set_target_properties(${MODULE_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${TESTING_OUTPUT_DIRECTORY}/${TEST_AREA}/${MODULE_NAME}") set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR/Test/Extra")