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