From 41298d69a9512922d38285ccd431ab699bace45d Mon Sep 17 00:00:00 2001 From: Bernhard Miklautz Date: Wed, 18 May 2016 17:13:45 +0200 Subject: [PATCH] build: fix builds with -DBUILD_SHARED_LIBS=OFF When no shared libs are built is required to export all generated archive files otherwise programs linking against freerdp-client/freerdp-server might miss symbols. Fixes #3350 --- channels/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/channels/CMakeLists.txt b/channels/CMakeLists.txt index a395697..b0bd197 100644 --- a/channels/CMakeLists.txt +++ b/channels/CMakeLists.txt @@ -193,7 +193,7 @@ macro(add_channel_client_library _module_prefix _module_name _channel_name _dyna set(${_module_prefix}_CHANNEL ${_channel_name} PARENT_SCOPE) set(${_module_prefix}_ENTRY ${_entry} PARENT_SCOPE) add_library(${_module_name} STATIC ${${_module_prefix}_SRCS}) - if (${CMAKE_VERSION} VERSION_LESS 2.8.12) + if (${CMAKE_VERSION} VERSION_LESS 2.8.12 OR NOT BUILD_SHARED_LIBS) client_channel_install(${_module_name} ${FREERDP_ADDIN_PATH}) endif() endif() @@ -225,7 +225,7 @@ macro(add_channel_client_subsystem_library _module_prefix _module_name _channel_ set(${_module_prefix}_NAME ${_module_name} PARENT_SCOPE) set(${_module_prefix}_TYPE ${_type} PARENT_SCOPE) add_library(${_module_name} STATIC ${${_module_prefix}_SRCS}) - if (${CMAKE_VERSION} VERSION_LESS 2.8.12) + if (${CMAKE_VERSION} VERSION_LESS 2.8.12 OR NOT BUILD_SHARED_LIBS) client_channel_install(${_module_name} ${FREERDP_ADDIN_PATH}) endif() endif() @@ -257,7 +257,7 @@ macro(add_channel_server_library _module_prefix _module_name _channel_name _dyna set(${_module_prefix}_CHANNEL ${_channel_name} PARENT_SCOPE) set(${_module_prefix}_ENTRY ${_entry} PARENT_SCOPE) add_library(${_module_name} STATIC ${${_module_prefix}_SRCS}) - if (${CMAKE_VERSION} VERSION_LESS 2.8.12) + if (${CMAKE_VERSION} VERSION_LESS 2.8.12 OR NOT BUILD_SHARED_LIBS) server_channel_install(${_module_name} ${FREERDP_ADDIN_PATH}) endif() endif() -- 2.7.4