From aa028e8b0f9a222f9ec018fd581fcda6f0a22732 Mon Sep 17 00:00:00 2001 From: Thomas Jarosch Date: Tue, 10 Mar 2009 23:51:57 +0100 Subject: [PATCH] Added cpack support, updated ChangeLog and AUTHORS --- AUTHORS | 5 +++++ CMakeLists.txt | 34 ++++++++++++++++++++++++++++++++++ ChangeLog | 5 +++++ src/CMakeLists.txt | 2 ++ 4 files changed, 46 insertions(+), 0 deletions(-) diff --git a/AUTHORS b/AUTHORS index 40e23f3..f3b3d2d 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,3 +1,8 @@ Main developers: Intra2net AG + +Contributors in alphabetical order, +see ChangeLog for full details: + + Marius Kintel diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b76f13..b447b3f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,4 +33,38 @@ configure_file(${PROJECT_SOURCE_DIR}/config.h.cmake ${PROJECT_BINARY_DIR}/config add_definitions(-DHAVE_CONFIG_H) INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}) +# Package information +set(CPACK_PACKAGE_VERSION ${VERSION_STRING}) +set(CPACK_PACKAGE_CONTACT "http://www.intra2net.com/en/developer/libftdi/mailinglist.php") +set(CPACK_PACKAGE_DESCRIPTION "ftdi eeprom tool.") +set(CPACK_PACKAGE_DESCRIPTION_SUMMARY ${CPACK_PACKAGE_DESCRIPTION} + ) +# Package settings +if(${UNIX}) + set(CPACK_GENERATOR "DEB;RPM") + set(CPACK_CMAKE_GENERATOR "Unix Makefiles") + set(CPACK_PACKAGE_NAME ${PROJECT_NAME}) + set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}) +endif(${UNIX}) + +if(${WIN32}) + set(CPACK_GENERATOR "NSIS") + set(CPACK_CMAKE_GENERATOR "MinGW Makefiles") + set(CPACK_PACKAGE_NAME "${PROJECT_NAME}") + set(CPACK_PACKAGE_VENDOR "") + set(CPACK_PACKAGE_INSTALL_DIRECTORY "ftdi_eeprom") + set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${VERSION_STRING}-win32") + set(CPACK_NSIS_DISPLAY_NAME "ftdi_eeprom") + set(CPACK_NSIS_MODIFY_PATH "ON") +endif(${WIN32}) + +set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/COPYING) + +# Subdirectories +if(${UNIX}) + set(CPACK_SET_DESTDIR "ON") +endif(${UNIX}) + add_subdirectory(src) + +include(CPack) diff --git a/ChangeLog b/ChangeLog index 0794447..2e66b1f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +New in 0.4 - 2009-XX-XX +----------------------- +* cmake support (Marius Kintel) +* Updated autoconf suite + New in 0.3 - 2009-02-16 ----------------------- * Fix a crash using newer libftdi versions diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b49ee71..256cf1f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,2 +1,4 @@ ADD_EXECUTABLE(ftdi_eeprom main.c) TARGET_LINK_LIBRARIES(ftdi_eeprom ${libs}) + +install (TARGETS ftdi_eeprom DESTINATION bin) -- 1.7.1