From f0a45f96f5e240b4f79b6962ca8934389f3a29f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= Date: Wed, 10 Apr 2013 17:09:35 -0400 Subject: [PATCH] client: add CLIENT_INTERFACE_SHARED option forcing shared client libs with BUILD_SHARED_LIBS=off, making a single library --- client/Windows/CMakeLists.txt | 6 +++++- client/X11/CMakeLists.txt | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/client/Windows/CMakeLists.txt b/client/Windows/CMakeLists.txt index 678a9b5a1..0f2b26d65 100644 --- a/client/Windows/CMakeLists.txt +++ b/client/Windows/CMakeLists.txt @@ -37,7 +37,11 @@ set(${MODULE_PREFIX}_SRCS resource.h) if(WITH_CLIENT_INTERFACE) - add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS}) + if(CLIENT_INTERFACE_SHARED) + add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS}) + else() + add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS}) + endif() set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION} PREFIX "lib") else() set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} cli/wfreerdp.c cli/wfreerdp.h) diff --git a/client/X11/CMakeLists.txt b/client/X11/CMakeLists.txt index 0461a3550..7d08ea670 100644 --- a/client/X11/CMakeLists.txt +++ b/client/X11/CMakeLists.txt @@ -44,7 +44,11 @@ set(${MODULE_PREFIX}_SRCS xf_interface.h) if(WITH_CLIENT_INTERFACE) - add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS}) + if(CLIENT_INTERFACE_SHARED) + add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS}) + else() + add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS}) + endif() set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION} PREFIX "lib") else() set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} cli/xfreerdp.c cli/xfreerdp.h)