1From 7e57ff280b55b45e74329b9988279e8831d32eab Mon Sep 17 00:00:00 2001 2From: Samuel Martin <s.martin49@gmail.com> 3Date: Sun, 25 Jan 2015 09:45:04 +0100 4Subject: [PATCH] cmake: use the standard CMake flag to drive the shared 5 object build 6 7Remove the STATICLIBS CMake option (and the code handling it) and let 8the standard CMake flags drive the shared object build. 9 10Signed-off-by: Samuel Martin <s.martin49@gmail.com> 11[Fabrice: update for 1.5] 12Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 13--- 14 CMakeOptions.txt | 1 - 15 ftdipp/CMakeLists.txt | 14 +------------- 16 src/CMakeLists.txt | 13 +------------ 17 3 files changed, 2 insertions(+), 26 deletions(-) 18 19diff --git a/CMakeOptions.txt b/CMakeOptions.txt 20index 07b5887..b780ffd 100644 21--- a/CMakeOptions.txt 22+++ b/CMakeOptions.txt 23@@ -1,4 +1,3 @@ 24-option ( STATICLIBS "Build static libraries" ON ) 25 option ( BUILD_TESTS "Build unit tests with Boost Unit Test framework" OFF ) 26 option ( DOCUMENTATION "Generate API documentation with Doxygen" OFF ) 27 option ( EXAMPLES "Build example programs" ON ) 28diff --git a/ftdipp/CMakeLists.txt b/ftdipp/CMakeLists.txt 29index fac5bcc..a06edf1 100644 30--- a/ftdipp/CMakeLists.txt 31+++ b/ftdipp/CMakeLists.txt 32@@ -12,7 +12,7 @@ include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR} 33 include_directories(${Boost_INCLUDE_DIRS}) 34 35 # Shared library 36-add_library(ftdipp1 SHARED ${cpp_sources}) 37+add_library(ftdipp1 ${cpp_sources}) 38 39 math(EXPR VERSION_FIXUP "${MAJOR_VERSION} + 1") # Compatibility with previous releases 40 set_target_properties(ftdipp1 PROPERTIES VERSION ${VERSION_FIXUP}.${MINOR_VERSION}.0 SOVERSION 3) 41@@ -29,18 +29,6 @@ install ( TARGETS ftdipp1 42 ARCHIVE DESTINATION lib${LIB_SUFFIX} 43 ) 44 45-# Static library 46-if ( STATICLIBS ) 47- add_library(ftdipp1-static STATIC ${cpp_sources}) 48- set_target_properties(ftdipp1-static PROPERTIES OUTPUT_NAME "ftdipp1") 49- set_target_properties(ftdipp1-static PROPERTIES CLEAN_DIRECT_OUTPUT 1) 50- 51- install ( TARGETS ftdipp1-static 52- ARCHIVE DESTINATION lib${LIB_SUFFIX} 53- COMPONENT staticlibs 54- ) 55-endif () 56- 57 install ( FILES ${cpp_headers} 58 DESTINATION include/${PROJECT_NAME} 59 COMPONENT headers 60diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt 61index 17b3617..ae4fc61 100644 62--- a/src/CMakeLists.txt 63+++ b/src/CMakeLists.txt 64@@ -21,7 +21,7 @@ configure_file(ftdi_version_i.h.in "${CMAKE_CURRENT_BINARY_DIR}/ftdi_version_i.h 65 set(c_sources ${CMAKE_CURRENT_SOURCE_DIR}/ftdi.c ${CMAKE_CURRENT_SOURCE_DIR}/ftdi_stream.c CACHE INTERNAL "List of c sources" ) 66 set(c_headers ${CMAKE_CURRENT_SOURCE_DIR}/ftdi.h CACHE INTERNAL "List of c headers" ) 67 68-add_library(ftdi1 SHARED ${c_sources}) 69+add_library(ftdi1 ${c_sources}) 70 71 math(EXPR VERSION_FIXUP "${MAJOR_VERSION} + 1") # Compatibility with previous releases 72 set_target_properties(ftdi1 PROPERTIES VERSION ${VERSION_FIXUP}.${MINOR_VERSION}.0 SOVERSION 2) 73@@ -38,17 +38,6 @@ install ( TARGETS ftdi1 74 ARCHIVE DESTINATION lib${LIB_SUFFIX} 75 ) 76 77-if ( STATICLIBS ) 78- add_library(ftdi1-static STATIC ${c_sources}) 79- target_link_libraries(ftdi1-static ${LIBUSB_LIBRARIES}) 80- set_target_properties(ftdi1-static PROPERTIES OUTPUT_NAME "ftdi1") 81- set_target_properties(ftdi1-static PROPERTIES CLEAN_DIRECT_OUTPUT 1) 82- install ( TARGETS ftdi1-static 83- ARCHIVE DESTINATION lib${LIB_SUFFIX} 84- COMPONENT staticlibs 85- ) 86-endif () 87- 88 install ( FILES ${c_headers} 89 DESTINATION include/${PROJECT_NAME} 90 COMPONENT headers 91-- 922.27.0 93 94