From ecbe24ca9ac4b1ca3cb12b17bd1b2f2391f19b70 Mon Sep 17 00:00:00 2001 From: Rex Tsai Date: Thu, 1 Sep 2011 22:18:58 +0800 Subject: [PATCH] cmake: make linking type as option. --- CMakeLists.txt | 5 +++++ channels/cliprdr/CMakeLists.txt | 2 +- channels/drdynvc/CMakeLists.txt | 2 +- channels/rail/CMakeLists.txt | 2 +- channels/rdpdbg/CMakeLists.txt | 2 +- channels/rdpdr/CMakeLists.txt | 2 +- channels/rdpdr/disk/CMakeLists.txt | 2 +- channels/rdpdr/printer/CMakeLists.txt | 2 +- channels/rdpsnd/CMakeLists.txt | 2 +- channels/rdpsnd/alsa/CMakeLists.txt | 2 +- channels/rdpsnd/pulse/CMakeLists.txt | 2 +- libfreerdp-cache/CMakeLists.txt | 2 +- libfreerdp-chanman/CMakeLists.txt | 2 +- libfreerdp-core/CMakeLists.txt | 2 +- libfreerdp-gdi/CMakeLists.txt | 2 +- libfreerdp-kbd/CMakeLists.txt | 2 +- libfreerdp-rail/CMakeLists.txt | 2 +- libfreerdp-rfx/CMakeLists.txt | 2 +- libfreerdp-rfx/sse2/CMakeLists.txt | 2 +- libfreerdp-utils/CMakeLists.txt | 2 +- 20 files changed, 24 insertions(+), 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a2ca7b9..1380dae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,6 +51,11 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR) set(CMAKE_INSTALL_LIBDIR "lib") endif() +# build shared libs +if(NOT BUILD_SHARED_LIBS) + set(BUILD_SHARED_LIBS ON) +endif() + # Compiler-specific flags if(CMAKE_COMPILER_IS_GNUCC) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-unused-but-set-variable") diff --git a/channels/cliprdr/CMakeLists.txt b/channels/cliprdr/CMakeLists.txt index d74f823..03fb0ba 100644 --- a/channels/cliprdr/CMakeLists.txt +++ b/channels/cliprdr/CMakeLists.txt @@ -25,7 +25,7 @@ set(CLIPRDR_SRCS cliprdr_main.h ) -add_library(cliprdr SHARED ${CLIPRDR_SRCS}) +add_library(cliprdr ${CLIPRDR_SRCS}) set_target_properties(cliprdr PROPERTIES PREFIX "") target_link_libraries(cliprdr freerdp-utils) diff --git a/channels/drdynvc/CMakeLists.txt b/channels/drdynvc/CMakeLists.txt index a21e4fa..c3bdbb0 100644 --- a/channels/drdynvc/CMakeLists.txt +++ b/channels/drdynvc/CMakeLists.txt @@ -25,7 +25,7 @@ set(DRDYNVC_SRCS dvcman.h ) -add_library(drdynvc SHARED ${DRDYNVC_SRCS}) +add_library(drdynvc ${DRDYNVC_SRCS}) set_target_properties(drdynvc PROPERTIES PREFIX "") target_link_libraries(drdynvc freerdp-utils) diff --git a/channels/rail/CMakeLists.txt b/channels/rail/CMakeLists.txt index b1ce557..3164111 100644 --- a/channels/rail/CMakeLists.txt +++ b/channels/rail/CMakeLists.txt @@ -23,7 +23,7 @@ set(RAIL_SRCS rail_orders.c rail_orders.h) -add_library(rail SHARED ${RAIL_SRCS}) +add_library(rail ${RAIL_SRCS}) set_target_properties(rail PROPERTIES PREFIX "") target_link_libraries(rail freerdp-utils) diff --git a/channels/rdpdbg/CMakeLists.txt b/channels/rdpdbg/CMakeLists.txt index d8159b5..db562a0 100644 --- a/channels/rdpdbg/CMakeLists.txt +++ b/channels/rdpdbg/CMakeLists.txt @@ -21,7 +21,7 @@ set(RDPDBG_SRCS rdpdbg_main.c ) -add_library(rdpdbg SHARED ${RDPDBG_SRCS}) +add_library(rdpdbg ${RDPDBG_SRCS}) set_target_properties(rdpdbg PROPERTIES PREFIX "") target_link_libraries(rdpdbg freerdp-utils) diff --git a/channels/rdpdr/CMakeLists.txt b/channels/rdpdr/CMakeLists.txt index be54ca6..7eda114 100644 --- a/channels/rdpdr/CMakeLists.txt +++ b/channels/rdpdr/CMakeLists.txt @@ -30,7 +30,7 @@ set(RDPDR_SRCS rdpdr_main.h ) -add_library(rdpdr SHARED ${RDPDR_SRCS}) +add_library(rdpdr ${RDPDR_SRCS}) set_target_properties(rdpdr PROPERTIES PREFIX "") target_link_libraries(rdpdr freerdp-utils) diff --git a/channels/rdpdr/disk/CMakeLists.txt b/channels/rdpdr/disk/CMakeLists.txt index 5a44c81..c1acd80 100644 --- a/channels/rdpdr/disk/CMakeLists.txt +++ b/channels/rdpdr/disk/CMakeLists.txt @@ -25,7 +25,7 @@ set(DISK_SRCS include_directories(..) -add_library(disk SHARED ${DISK_SRCS}) +add_library(disk ${DISK_SRCS}) set_target_properties(disk PROPERTIES PREFIX "") target_link_libraries(disk freerdp-utils) diff --git a/channels/rdpdr/printer/CMakeLists.txt b/channels/rdpdr/printer/CMakeLists.txt index fc7784f..d70eb02 100644 --- a/channels/rdpdr/printer/CMakeLists.txt +++ b/channels/rdpdr/printer/CMakeLists.txt @@ -33,7 +33,7 @@ endif() include_directories(..) -add_library(printer SHARED ${PRINTER_SRCS}) +add_library(printer ${PRINTER_SRCS}) set_target_properties(printer PROPERTIES PREFIX "") target_link_libraries(printer freerdp-utils) diff --git a/channels/rdpsnd/CMakeLists.txt b/channels/rdpsnd/CMakeLists.txt index c1b0862..c5413ee 100644 --- a/channels/rdpsnd/CMakeLists.txt +++ b/channels/rdpsnd/CMakeLists.txt @@ -22,7 +22,7 @@ set(RDPSND_SRCS rdpsnd_main.h ) -add_library(rdpsnd SHARED ${RDPSND_SRCS}) +add_library(rdpsnd ${RDPSND_SRCS}) set_target_properties(rdpsnd PROPERTIES PREFIX "") target_link_libraries(rdpsnd freerdp-utils) diff --git a/channels/rdpsnd/alsa/CMakeLists.txt b/channels/rdpsnd/alsa/CMakeLists.txt index 73a9f4e..4d6deb4 100644 --- a/channels/rdpsnd/alsa/CMakeLists.txt +++ b/channels/rdpsnd/alsa/CMakeLists.txt @@ -24,7 +24,7 @@ set(RDPSND_ALSA_SRCS include_directories(..) include_directories(${ALSA_INCLUDE_DIRS}) -add_library(rdpsnd_alsa SHARED ${RDPSND_ALSA_SRCS}) +add_library(rdpsnd_alsa ${RDPSND_ALSA_SRCS}) set_target_properties(rdpsnd_alsa PROPERTIES PREFIX "") target_link_libraries(rdpsnd_alsa freerdp-utils) diff --git a/channels/rdpsnd/pulse/CMakeLists.txt b/channels/rdpsnd/pulse/CMakeLists.txt index 0c6c200..4460daf 100644 --- a/channels/rdpsnd/pulse/CMakeLists.txt +++ b/channels/rdpsnd/pulse/CMakeLists.txt @@ -24,7 +24,7 @@ set(RDPSND_PULSE_SRCS include_directories(..) include_directories(${PULSE_INCLUDE_DIRS}) -add_library(rdpsnd_pulse SHARED ${RDPSND_PULSE_SRCS}) +add_library(rdpsnd_pulse ${RDPSND_PULSE_SRCS}) set_target_properties(rdpsnd_pulse PROPERTIES PREFIX "") target_link_libraries(rdpsnd_pulse freerdp-utils) diff --git a/libfreerdp-cache/CMakeLists.txt b/libfreerdp-cache/CMakeLists.txt index 413c600..7feb8fa 100644 --- a/libfreerdp-cache/CMakeLists.txt +++ b/libfreerdp-cache/CMakeLists.txt @@ -26,7 +26,7 @@ set(FREERDP_CACHE_SRCS glyph.c cache.c) -add_library(freerdp-cache SHARED ${FREERDP_CACHE_SRCS}) +add_library(freerdp-cache ${FREERDP_CACHE_SRCS}) set_target_properties(freerdp-cache PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib") diff --git a/libfreerdp-chanman/CMakeLists.txt b/libfreerdp-chanman/CMakeLists.txt index dae9904..f4d334c 100644 --- a/libfreerdp-chanman/CMakeLists.txt +++ b/libfreerdp-chanman/CMakeLists.txt @@ -21,7 +21,7 @@ set(FREERDP_CHANMAN_SRCS libchanman.c libchanman.h) -add_library(freerdp-chanman SHARED ${FREERDP_CHANMAN_SRCS}) +add_library(freerdp-chanman ${FREERDP_CHANMAN_SRCS}) set_target_properties(freerdp-chanman PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib") target_link_libraries(freerdp-chanman freerdp-utils) diff --git a/libfreerdp-core/CMakeLists.txt b/libfreerdp-core/CMakeLists.txt index ec44fe2..f3c592a 100644 --- a/libfreerdp-core/CMakeLists.txt +++ b/libfreerdp-core/CMakeLists.txt @@ -92,7 +92,7 @@ set(LIBFREERDP_CORE_SRCS peer.h ) -add_library(freerdp-core SHARED ${LIBFREERDP_CORE_SRCS}) +add_library(freerdp-core ${LIBFREERDP_CORE_SRCS}) set_target_properties(freerdp-core PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib") diff --git a/libfreerdp-gdi/CMakeLists.txt b/libfreerdp-gdi/CMakeLists.txt index c04c93e..ae3f4fd 100644 --- a/libfreerdp-gdi/CMakeLists.txt +++ b/libfreerdp-gdi/CMakeLists.txt @@ -34,7 +34,7 @@ set(FREERDP_GDI_SRCS shape.c gdi.c) -add_library(freerdp-gdi SHARED ${FREERDP_GDI_SRCS}) +add_library(freerdp-gdi ${FREERDP_GDI_SRCS}) target_link_libraries(freerdp-gdi freerdp-cache) target_link_libraries(freerdp-gdi freerdp-rfx) diff --git a/libfreerdp-kbd/CMakeLists.txt b/libfreerdp-kbd/CMakeLists.txt index d5dfec8..3f6f1e4 100644 --- a/libfreerdp-kbd/CMakeLists.txt +++ b/libfreerdp-kbd/CMakeLists.txt @@ -27,7 +27,7 @@ set(FREERDP_KBD_SRCS libkbd.c libkbd.h) -add_library(freerdp-kbd SHARED ${FREERDP_KBD_SRCS}) +add_library(freerdp-kbd ${FREERDP_KBD_SRCS}) find_suggested_package(XKBFile) if(XKBFILE_FOUND) diff --git a/libfreerdp-rail/CMakeLists.txt b/libfreerdp-rail/CMakeLists.txt index 1dbcad7..aaa2b6c 100644 --- a/libfreerdp-rail/CMakeLists.txt +++ b/libfreerdp-rail/CMakeLists.txt @@ -23,7 +23,7 @@ set(FREERDP_RAIL_SRCS icon.c rail.c) -add_library(freerdp-rail SHARED ${FREERDP_RAIL_SRCS}) +add_library(freerdp-rail ${FREERDP_RAIL_SRCS}) set_target_properties(freerdp-rail PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib") diff --git a/libfreerdp-rfx/CMakeLists.txt b/libfreerdp-rfx/CMakeLists.txt index d45c433..fa7cea0 100644 --- a/libfreerdp-rfx/CMakeLists.txt +++ b/libfreerdp-rfx/CMakeLists.txt @@ -39,7 +39,7 @@ set(LIBFREERDP_RFX_SRCS librfx.c ) -add_library(freerdp-rfx SHARED ${LIBFREERDP_RFX_SRCS}) +add_library(freerdp-rfx ${LIBFREERDP_RFX_SRCS}) set_target_properties(freerdp-rfx PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib") diff --git a/libfreerdp-rfx/sse2/CMakeLists.txt b/libfreerdp-rfx/sse2/CMakeLists.txt index a81678e..8382e43 100644 --- a/libfreerdp-rfx/sse2/CMakeLists.txt +++ b/libfreerdp-rfx/sse2/CMakeLists.txt @@ -24,7 +24,7 @@ set(LIBFREERDP_RFX_SSE2_SRCS include_directories(..) -add_library(freerdp-rfx-sse2 STATIC ${LIBFREERDP_RFX_SSE2_SRCS}) +add_library(freerdp-rfx-sse2 ${LIBFREERDP_RFX_SSE2_SRCS}) if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") set_target_properties(freerdp-rfx-sse2 PROPERTIES COMPILE_FLAGS "-fPIC") diff --git a/libfreerdp-utils/CMakeLists.txt b/libfreerdp-utils/CMakeLists.txt index b869f5d..12b84e3 100644 --- a/libfreerdp-utils/CMakeLists.txt +++ b/libfreerdp-utils/CMakeLists.txt @@ -46,7 +46,7 @@ set(FREERDP_UTILS_SRCS add_definitions(-DPLUGIN_PATH="${FREERDP_PLUGIN_PATH}") -add_library(freerdp-utils SHARED ${FREERDP_UTILS_SRCS}) +add_library(freerdp-utils ${FREERDP_UTILS_SRCS}) set_target_properties(freerdp-utils PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib") -- 2.7.4