diff options
| -rw-r--r-- | CMakeLists.txt | 35 | ||||
| -rw-r--r-- | Copyright.txt | 37 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 10 |
4 files changed, 62 insertions, 22 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b890d07..32d3c45 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ INCLUDE(cmake/macros.cmake) PROJECT(libaec) SET(libaec_VERSION_MAJOR 0) SET(libaec_VERSION_MINOR 3) -SET(libaec_VERSION_PATCH 2) +SET(libaec_VERSION_PATCH 3) SET(CMAKE_BUILD_TYPE Release) ENABLE_TESTING() @@ -46,24 +46,27 @@ ADD_SUBDIRECTORY(src) ADD_SUBDIRECTORY(tests) SET(CPACK_PACKAGE_NAME "libaec") -SET(CPACK_PACKAGE_VENDOR "dkrz.de") +SET(CPACK_PACKAGE_VENDOR "Deutsches Klimarechenzentrum GmbH") SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "libaec - Adaptive Entropy Coding library") -SET(CPACK_PACKAGE_VERSION_MAJOR "0") -SET(CPACK_PACKAGE_VERSION_MINOR "3") -SET(CPACK_PACKAGE_VERSION_PATCH "3") +SET(CPACK_PACKAGE_VERSION_MAJOR "${libaec_VERSION_MAJOR}") +SET(CPACK_PACKAGE_VERSION_MINOR "${libaec_VERSION_MINOR}") +SET(CPACK_PACKAGE_VERSION_PATCH "${libaec_VERSION_PATCH}") SET(CPACK_PACKAGE_INSTALL_DIRECTORY "libaec") -SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/COPYING") -SET(CPACK_RESOURCE_FILE_README "${PROJECT_SOURCE_DIR}/README") +SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/Copyright.txt") -IF(CMAKE_CL_64) - SET(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES64") - SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY - "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION} (Win64)") -ELSE(CMAKE_CL_64) - SET(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES") - SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY - "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}") -ENDIF(CMAKE_CL_64) +IF(WIN32) + SET(CPACK_GENERATOR "WIX") + SET(CPACK_WIX_UPGRADE_GUID "E58A21F6-BB99-46B5-8AD8-6114E4CCA0A6") + IF(CMAKE_CL_64) + SET(CPACK_INSTALL_DIRECTORY "$PROGRAMFILES64") + SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY + "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION} (Win64)") + ELSE(CMAKE_CL_64) + SET(CPACK_INSTALL_DIRECTORY "$PROGRAMFILES") + SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY + "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}") + ENDIF(CMAKE_CL_64) +ENDIF(WIN32) INCLUDE(CPack) diff --git a/Copyright.txt b/Copyright.txt new file mode 100644 index 0000000..8e04dc3 --- /dev/null +++ b/Copyright.txt @@ -0,0 +1,37 @@ +Copyright 2012 - 2016 + +Mathis Rosenhauer, Moritz Hanke, Joerg Behrens +Deutsches Klimarechenzentrum GmbH +Bundesstr. 45a +20146 Hamburg +Germany + +Luis Kornblueh +Max-Planck-Institut fuer Meteorologie +Bundesstr. 53 +20146 Hamburg +Germany + +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/Makefile.am b/Makefile.am index 58341ed..08c63a1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = src tests EXTRA_DIST = doc/license.txt CMakeLists.txt cmake/config.h.in \ -cmake/macros.cmake README.SZIP +cmake/macros.cmake README.SZIP Copyright.txt bench: all cd tests && $(MAKE) $(AM_MAKEFLAGS) bench diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5e9a136..1b6d744 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -23,7 +23,6 @@ IF(UNIX) ADD_EXECUTABLE(utime EXCLUDE_FROM_ALL utime.c) ENDIF(UNIX) -INSTALL(FILES libaec.h szlib.h DESTINATION include) IF(WIN32) INSTALL(TARGETS aec sz RUNTIME @@ -41,13 +40,14 @@ ELSE(WIN32) COMPONENT libraries ) ENDIF(WIN32) +INSTALL(FILES libaec.h szlib.h + DESTINATION include + COMPONENT headers + ) INSTALL(TARGETS aec_client RUNTIME DESTINATION bin COMPONENT applications ) -INSTALL(FILES libaec.h szlib.h - DESTINATION include - COMPONENT headers - ) + SET(CPACK_COMPONENTS_ALL applications libraries headers) |