Merge pull request #1965 from akallabeth/dynamic-addin-naming

Dynamic channel library naming
2026-04-15 00:44:19 +09:00 · 2014-10-31 13:42:16 +01:00
parent d323753a9e f31eb52e46
commit 0be28ba0f6
55 changed files with 73 additions and 63 deletions
--- 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)

--- 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})

--- 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})

--- 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})

--- 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)

--- 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)

--- a/channels/client/addin.c
+++ b/channels/client/addin.c
@@ -156,19 +156,23 @@ FREERDP_ADDIN** freerdp_channels_list_dynamic_addins(LPSTR pszName, LPSTR pszSub

 	if (pszName && pszSubsystem && pszType)
 	{
-		sprintf_s(pszPattern, cchPattern, "%s-client-%s-%s.%s", pszName, pszSubsystem, pszType, pszExtension);
+		sprintf_s(pszPattern, cchPattern, CMAKE_SHARED_LIBRARY_PREFIX"%s-client-%s-%s.%s",
+				  pszName, pszSubsystem, pszType, pszExtension);
 	}
 	else if (pszName && pszType)
 	{
-		sprintf_s(pszPattern, cchPattern, "%s-client-?-%s.%s", pszName, pszType, pszExtension);
+		sprintf_s(pszPattern, cchPattern, CMAKE_SHARED_LIBRARY_PREFIX"%s-client-?-%s.%s",
+				  pszName, pszType, pszExtension);
 	}
 	else if (pszName)
 	{
-		sprintf_s(pszPattern, cchPattern, "%s-client*.%s", pszName, pszExtension);
+		sprintf_s(pszPattern, cchPattern, CMAKE_SHARED_LIBRARY_PREFIX"%s-client*.%s",
+				  pszName, pszExtension);
 	}
 	else
 	{
-		sprintf_s(pszPattern, cchPattern, "?-client*.%s", pszExtension);
+		sprintf_s(pszPattern, cchPattern, CMAKE_SHARED_LIBRARY_PREFIX"?-client*.%s",
+				  pszExtension);
 	}

 	cchPattern = strlen(pszPattern);
--- 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)

--- 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)

--- 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)

--- 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)
 	
--- 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)

--- 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)

--- 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)

--- 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)

--- 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)

--- 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)

--- 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)

--- 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)

--- 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)

--- 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)

--- 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)

--- 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)

--- 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)

--- 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)

--- 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)
 	
--- 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}
--- 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}
--- 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})

--- 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)
--- 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)
--- 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)

--- 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)

--- 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)

--- 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)

--- a/channels/server/CMakeLists.txt
+++ b/channels/server/CMakeLists.txt
@@ -50,7 +50,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)

--- 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)

--- 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)

--- 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})

--- 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
--- 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)

--- 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)

--- 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)

--- 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})
--- a/client/Windows/CMakeLists.txt
+++ b/client/Windows/CMakeLists.txt
@@ -68,7 +68,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})
--- 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})
--- a/client/common/CMakeLists.txt
+++ b/client/common/CMakeLists.txt
@@ -66,7 +66,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})
--- a/config.h.in
+++ b/config.h.in
@@ -11,6 +11,9 @@

 #define FREERDP_ADDIN_PATH "${FREERDP_ADDIN_PATH}"

+#define CMAKE_SHARED_LIBRARY_SUFFIX "${CMAKE_SHARED_LIBRARY_SUFFIX}"
+#define CMAKE_SHARED_LIBRARY_PREFIX  "${CMAKE_SHARED_LIBRARY_PREFIX}"
+
 /* Include files */
 #cmakedefine HAVE_FCNTL_H
 #cmakedefine HAVE_UNISTD_H
--- a/libfreerdp/CMakeLists.txt
+++ b/libfreerdp/CMakeLists.txt
@@ -299,7 +299,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)
--- a/libfreerdp/common/addin.c
+++ b/libfreerdp/common/addin.c
@@ -118,9 +118,9 @@ void* freerdp_load_dynamic_addin(LPCSTR pszFileName, LPCSTR pszPath, LPCSTR pszE
 	}
 	else
 	{
-		cchAddinFile = cchFileName + cchExt + 2;
+		cchAddinFile = cchFileName + cchExt + 2 + sizeof(CMAKE_SHARED_LIBRARY_PREFIX);
 		pszAddinFile = (LPSTR) malloc(cchAddinFile + 1);
-		sprintf_s(pszAddinFile, cchAddinFile, "%s%s", pszFileName, pszExt);
+		sprintf_s(pszAddinFile, cchAddinFile, CMAKE_SHARED_LIBRARY_PREFIX"%s%s", pszFileName, pszExt);
 		cchAddinFile = strlen(pszAddinFile);
 	}

@@ -151,30 +151,31 @@ void* freerdp_load_dynamic_channel_addin_entry(LPCSTR pszName, LPSTR pszSubsyste
 {
 	void* entry;
 	LPSTR pszFileName;
-	size_t cchFileName;
+	size_t cchFileName = sizeof(CMAKE_SHARED_LIBRARY_PREFIX) + 32;
 	LPCSTR pszExtension;
+	LPCSTR pszPrefix = CMAKE_SHARED_LIBRARY_PREFIX;

 	pszExtension = PathGetSharedLibraryExtensionA(0);

 	if (pszName && pszSubsystem && pszType)
 	{
-		cchFileName = strlen(pszName) + strlen(pszSubsystem) + strlen(pszType) + strlen(pszExtension) + 32;
+		cchFileName += strlen(pszName) + strlen(pszSubsystem) + strlen(pszType) + strlen(pszExtension);
 		pszFileName = (LPSTR) malloc(cchFileName);
-		sprintf_s(pszFileName, cchFileName, "%s-client-%s-%s.%s", pszName, pszSubsystem, pszType, pszExtension);
+		sprintf_s(pszFileName, cchFileName, "%s%s-client-%s-%s.%s", pszPrefix, pszName, pszSubsystem, pszType, pszExtension);
 		cchFileName = strlen(pszFileName);
 	}
 	else if (pszName && pszSubsystem)
 	{
-		cchFileName = strlen(pszName) + strlen(pszSubsystem) + strlen(pszExtension) + 32;
+		cchFileName += strlen(pszName) + strlen(pszSubsystem) + strlen(pszExtension);
 		pszFileName = (LPSTR) malloc(cchFileName);
-		sprintf_s(pszFileName, cchFileName, "%s-client-%s.%s", pszName, pszSubsystem, pszExtension);
+		sprintf_s(pszFileName, cchFileName, "%s%s-client-%s.%s", pszPrefix, pszName, pszSubsystem, pszExtension);
 		cchFileName = strlen(pszFileName);
 	}
 	else if (pszName)
 	{
-		cchFileName = strlen(pszName) + strlen(pszExtension) + 32;
+		cchFileName += strlen(pszName) + strlen(pszExtension);
 		pszFileName = (LPSTR) malloc(cchFileName);
-		sprintf_s(pszFileName, cchFileName, "%s-client.%s", pszName, pszExtension);
+		sprintf_s(pszFileName, cchFileName, "%s%s-client.%s", pszPrefix, pszName, pszExtension);
 		cchFileName = strlen(pszFileName);
 	}
 	else
--- a/server/Windows/CMakeLists.txt
+++ b/server/Windows/CMakeLists.txt
@@ -81,7 +81,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})
--- a/server/common/CMakeLists.txt
+++ b/server/common/CMakeLists.txt
@@ -46,7 +46,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})
--- a/winpr/libwinpr/CMakeLists.txt
+++ b/winpr/libwinpr/CMakeLists.txt
@@ -116,7 +116,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)
--- a/winpr/libwinpr/library/test/TestLibraryA/CMakeLists.txt
+++ b/winpr/libwinpr/library/test/TestLibraryA/CMakeLists.txt
@@ -27,6 +27,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")
--- a/winpr/libwinpr/library/test/TestLibraryB/CMakeLists.txt
+++ b/winpr/libwinpr/library/test/TestLibraryB/CMakeLists.txt
@@ -27,6 +27,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")