From 0c1fd59d5f32065a8a795fc95c7ef6311439aa7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= Date: Tue, 16 Oct 2012 17:33:07 -0400 Subject: [PATCH] cmake: fix client add library macro --- channels/CMakeLists.txt | 6 +++--- channels/audin/client/CMakeLists.txt | 2 +- channels/cliprdr/client/CMakeLists.txt | 2 +- channels/disk/client/CMakeLists.txt | 2 +- channels/drdynvc/client/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/rdpsnd/client/CMakeLists.txt | 2 +- channels/sample/client/CMakeLists.txt | 2 +- channels/serial/client/CMakeLists.txt | 2 +- channels/smartcard/client/CMakeLists.txt | 2 +- channels/tsmf/client/CMakeLists.txt | 2 +- channels/urbdrc/client/CMakeLists.txt | 2 +- 15 files changed, 17 insertions(+), 17 deletions(-) diff --git a/channels/CMakeLists.txt b/channels/CMakeLists.txt index 7dd368cf8..77f59daaa 100644 --- a/channels/CMakeLists.txt +++ b/channels/CMakeLists.txt @@ -21,7 +21,7 @@ macro(add_channel_client _channel_prefix _channel_name) add_subdirectory(client) if(${_channel_prefix}_CLIENT_STATIC) set(CHANNEL_STATIC_CLIENT_MODULES ${CHANNEL_STATIC_CLIENT_MODULES} ${_channel_prefix} PARENT_SCOPE) - set(${_channel_prefix}_CLIENT_NAME ${_channel_name} PARENT_SCOPE) + set(${_channel_prefix}_CLIENT_NAME ${${_channel_prefix}_CLIENT_NAME} PARENT_SCOPE) set(${_channel_prefix}_CLIENT_CHANNEL ${${_channel_prefix}_CLIENT_CHANNEL} PARENT_SCOPE) set(${_channel_prefix}_CLIENT_ENTRY ${${_channel_prefix}_CLIENT_ENTRY} PARENT_SCOPE) set(CHANNEL_STATIC_CLIENT_ENTRIES ${CHANNEL_STATIC_CLIENT_ENTRIES} ${${_channel_prefix}_CLIENT_ENTRY} PARENT_SCOPE) @@ -39,7 +39,7 @@ macro(add_channel_server _channel_prefix _channel_name) endif() endmacro(add_channel_server) -macro(add_channel_client_library _module_prefix _module_name _plugin _entry) +macro(add_channel_client_library _module_prefix _module_name _channel_name _plugin _entry) if(_plugin AND MSVC AND (NOT STATIC_CHANNELS)) set(${_module_prefix}_SRCS ${${_module_prefix}_SRCS} module.def) @@ -50,7 +50,7 @@ macro(add_channel_client_library _module_prefix _module_name _plugin _entry) else() set(${_module_prefix}_STATIC ON PARENT_SCOPE) set(${_module_prefix}_NAME ${_module_name} PARENT_SCOPE) - set(${_module_prefix}_CHANNEL ${_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}) endif() diff --git a/channels/audin/client/CMakeLists.txt b/channels/audin/client/CMakeLists.txt index b080c4c98..d3737de17 100644 --- a/channels/audin/client/CMakeLists.txt +++ b/channels/audin/client/CMakeLists.txt @@ -25,7 +25,7 @@ set(${MODULE_PREFIX}_SRCS include_directories(..) -add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} TRUE "DVCPluginEntry") +add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DVCPluginEntry") set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") diff --git a/channels/cliprdr/client/CMakeLists.txt b/channels/cliprdr/client/CMakeLists.txt index 2f8a3eb8d..5ba5f207e 100644 --- a/channels/cliprdr/client/CMakeLists.txt +++ b/channels/cliprdr/client/CMakeLists.txt @@ -26,7 +26,7 @@ set(${MODULE_PREFIX}_SRCS cliprdr_main.c cliprdr_main.h) -add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} FALSE "VirtualChannelEntry") +add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "VirtualChannelEntry") set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") diff --git a/channels/disk/client/CMakeLists.txt b/channels/disk/client/CMakeLists.txt index b94ec3db0..cfc5cdaef 100644 --- a/channels/disk/client/CMakeLists.txt +++ b/channels/disk/client/CMakeLists.txt @@ -31,7 +31,7 @@ if(WIN32) dirent.h) endif() -add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} TRUE "DeviceServiceEntry") +add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DeviceServiceEntry") set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") diff --git a/channels/drdynvc/client/CMakeLists.txt b/channels/drdynvc/client/CMakeLists.txt index fe900c399..ef87d495f 100644 --- a/channels/drdynvc/client/CMakeLists.txt +++ b/channels/drdynvc/client/CMakeLists.txt @@ -26,7 +26,7 @@ set(${MODULE_PREFIX}_SRCS dvcman.c dvcman.h) -add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} FALSE "VirtualChannelEntry") +add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "VirtualChannelEntry") set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") diff --git a/channels/parallel/client/CMakeLists.txt b/channels/parallel/client/CMakeLists.txt index d478ccdcf..0cf62f7c6 100644 --- a/channels/parallel/client/CMakeLists.txt +++ b/channels/parallel/client/CMakeLists.txt @@ -22,7 +22,7 @@ string(TOUPPER "CHANNEL_${CHANNEL_NAME}_CLIENT" MODULE_PREFIX) set(${MODULE_PREFIX}_SRCS parallel_main.c) -add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} TRUE "DeviceServiceEntry") +add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DeviceServiceEntry") set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") diff --git a/channels/printer/client/CMakeLists.txt b/channels/printer/client/CMakeLists.txt index 5471c3997..c375ff303 100644 --- a/channels/printer/client/CMakeLists.txt +++ b/channels/printer/client/CMakeLists.txt @@ -38,7 +38,7 @@ if(WIN32) printer_win.h) endif() -add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} TRUE "DeviceServiceEntry") +add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DeviceServiceEntry") set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") diff --git a/channels/rail/client/CMakeLists.txt b/channels/rail/client/CMakeLists.txt index ddabdf9b6..a7dc377b9 100644 --- a/channels/rail/client/CMakeLists.txt +++ b/channels/rail/client/CMakeLists.txt @@ -25,7 +25,7 @@ set(${MODULE_PREFIX}_SRCS rail_orders.c rail_orders.h) -add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} FALSE "VirtualChannelEntry") +add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "VirtualChannelEntry") set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") diff --git a/channels/rdpdr/client/CMakeLists.txt b/channels/rdpdr/client/CMakeLists.txt index 61ad6d580..8f395cd02 100644 --- a/channels/rdpdr/client/CMakeLists.txt +++ b/channels/rdpdr/client/CMakeLists.txt @@ -29,7 +29,7 @@ set(${MODULE_PREFIX}_SRCS rdpdr_capabilities.c rdpdr_capabilities.h) -add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} FALSE "VirtualChannelEntry") +add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "VirtualChannelEntry") set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") diff --git a/channels/rdpsnd/client/CMakeLists.txt b/channels/rdpsnd/client/CMakeLists.txt index e9e274eba..881a8e539 100644 --- a/channels/rdpsnd/client/CMakeLists.txt +++ b/channels/rdpsnd/client/CMakeLists.txt @@ -23,7 +23,7 @@ set(${MODULE_PREFIX}_SRCS rdpsnd_main.c rdpsnd_main.h) -add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} FALSE "VirtualChannelEntry") +add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "VirtualChannelEntry") set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") diff --git a/channels/sample/client/CMakeLists.txt b/channels/sample/client/CMakeLists.txt index cc1405c92..5df74531e 100644 --- a/channels/sample/client/CMakeLists.txt +++ b/channels/sample/client/CMakeLists.txt @@ -23,7 +23,7 @@ set(${MODULE_PREFIX}_SRCS skel_main.c skel_main.h) -add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} TRUE "DVCPluginEntry") +add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DVCPluginEntry") set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") diff --git a/channels/serial/client/CMakeLists.txt b/channels/serial/client/CMakeLists.txt index e6014a706..749397956 100644 --- a/channels/serial/client/CMakeLists.txt +++ b/channels/serial/client/CMakeLists.txt @@ -25,7 +25,7 @@ set(${MODULE_PREFIX}_SRCS serial_constants.h serial_main.c) -add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} TRUE "DeviceServiceEntry") +add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DeviceServiceEntry") set_target_properties(serial PROPERTIES PREFIX "") diff --git a/channels/smartcard/client/CMakeLists.txt b/channels/smartcard/client/CMakeLists.txt index 6071bc5cc..2ba9c72ca 100644 --- a/channels/smartcard/client/CMakeLists.txt +++ b/channels/smartcard/client/CMakeLists.txt @@ -24,7 +24,7 @@ set(${MODULE_PREFIX}_SRCS include_directories(${PCSC_INCLUDE_DIRS}) -add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} TRUE "DVCPluginEntry") +add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DVCPluginEntry") set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") diff --git a/channels/tsmf/client/CMakeLists.txt b/channels/tsmf/client/CMakeLists.txt index 0517173d5..fae6538f4 100644 --- a/channels/tsmf/client/CMakeLists.txt +++ b/channels/tsmf/client/CMakeLists.txt @@ -38,7 +38,7 @@ set(${MODULE_PREFIX}_SRCS include_directories(..) -add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} TRUE "DVCPluginEntry") +add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DVCPluginEntry") set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") diff --git a/channels/urbdrc/client/CMakeLists.txt b/channels/urbdrc/client/CMakeLists.txt index d41ad23a7..c06727c5a 100644 --- a/channels/urbdrc/client/CMakeLists.txt +++ b/channels/urbdrc/client/CMakeLists.txt @@ -33,7 +33,7 @@ set(${MODULE_PREFIX}_SRCS include_directories(..) -add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} TRUE "DVCPluginEntry") +add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DVCPluginEntry") set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "")