From: xantares Date: Thu, 15 Aug 2013 07:45:22 +0000 (+0200) Subject: Cleaned static-lib cmake doc. X-Git-Tag: v1.1rc1~17 X-Git-Url: http://developer.intra2net.com/git/?p=libftdi;a=commitdiff_plain;h=c2219c82ecb5731775fecec7f5348d62f578355b;hp=1ae0293e7aa959236d3a955c1af1a79e925a902a Cleaned static-lib cmake doc. --- diff --git a/ftdipp/CMakeLists.txt b/ftdipp/CMakeLists.txt index 8f581ef..7500211 100644 --- a/ftdipp/CMakeLists.txt +++ b/ftdipp/CMakeLists.txt @@ -29,17 +29,8 @@ if (FTDIPP) math(EXPR VERSION_FIXUP "${MAJOR_VERSION} + 1") # Compatiblity with previous releases set_target_properties(ftdipp1 PROPERTIES VERSION ${VERSION_FIXUP}.${MINOR_VERSION}.0 SOVERSION 2) - # Static library - if (STATICLIBS) - add_library(ftdipp1-static STATIC ${cpp_sources}) - set_target_properties(ftdipp1-static PROPERTIES OUTPUT_NAME "ftdipp1") - endif (STATICLIBS) - # Prevent clobbering each other during the build set_target_properties(ftdipp1 PROPERTIES CLEAN_DIRECT_OUTPUT 1) - if (STATICLIBS) - set_target_properties(ftdipp1-static PROPERTIES CLEAN_DIRECT_OUTPUT 1) - endif (STATICLIBS) # Dependencies target_link_libraries(ftdipp1 ftdi1 ${LIBUSB_LIBRARIES} ${BOOST_LIBRARIES}) @@ -50,8 +41,13 @@ if (FTDIPP) LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX} ) - + + # Static library if ( STATICLIBS ) + add_library(ftdipp1-static STATIC ${cpp_sources}) + set_target_properties(ftdipp1-static PROPERTIES OUTPUT_NAME "ftdipp1") + set_target_properties(ftdipp1-static PROPERTIES CLEAN_DIRECT_OUTPUT 1) + install ( TARGETS ftdipp1-static ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT staticlibs