From 58cd56c4889d4346c5e6fb8b94591658cdee3285 Mon Sep 17 00:00:00 2001 From: Bernhard Miklautz Date: Wed, 7 May 2014 20:56:49 +0200 Subject: [PATCH] sample channel: fix build sample channel is static and not dynamic therefore dynamic should be set to FALSE in add_channel_client_library --- channels/sample/ChannelOptions.cmake | 8 +++----- channels/sample/client/CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/channels/sample/ChannelOptions.cmake b/channels/sample/ChannelOptions.cmake index ffcf00be4..ae977457d 100644 --- a/channels/sample/ChannelOptions.cmake +++ b/channels/sample/ChannelOptions.cmake @@ -1,12 +1,11 @@ - set(OPTION_DEFAULT OFF) -set(OPTION_CLIENT_DEFAULT OFF) -set(OPTION_SERVER_DEFAULT OFF) if(WITH_SAMPLE) set(OPTION_CLIENT_DEFAULT ON) - set(OPTION_SERVER_DEFAULT OFF) +else() + set(OPTION_CLIENT_DEFAULT OFF) endif() +set(OPTION_SERVER_DEFAULT OFF) define_channel_options(NAME "sample" TYPE "static" DESCRIPTION "Sample Virtual Channel Extension" @@ -15,4 +14,3 @@ define_channel_options(NAME "sample" TYPE "static" define_channel_client_options(${OPTION_CLIENT_DEFAULT}) define_channel_server_options(${OPTION_SERVER_DEFAULT}) - diff --git a/channels/sample/client/CMakeLists.txt b/channels/sample/client/CMakeLists.txt index da50c7efc..867406d63 100644 --- a/channels/sample/client/CMakeLists.txt +++ b/channels/sample/client/CMakeLists.txt @@ -21,7 +21,7 @@ set(${MODULE_PREFIX}_SRCS sample_main.c sample_main.h) -add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "VirtualChannelEntry") +add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} FALSE "VirtualChannelEntry") set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "")