Version 1.0.5 (#17)

CHANGELOG.md

@@ -13,7 +13,9 @@ All notable changes to libaec will be documented in this file.
   the library and compressed data produced by this version can be
   uncompressed with previous versions.
 
-- Improvements to the build process and further documentation fixes.
+- Modernized CMake
+
+- Better CMake integration with HDF5 by Jan-Willem Blokland
 
 ## [1.0.4] - 2019-02-11
 

CMakeLists.txt

@@ -37,7 +37,6 @@ endif()
 configure_file(
   "cmake/config.h.in"
   "${CMAKE_CURRENT_BINARY_DIR}/config.h")
-add_definitions("-DHAVE_CONFIG_H")
 
 add_subdirectory(src)
 add_subdirectory(tests)

INSTALL.md

@@ -5,14 +5,19 @@ The source code of libaec is hosted at DKRZ GitLab.
 ## Source code and binary releases
 
 The latest releases of libaec can be downloaded at the following
-location:
+locations:
 
-  https://gitlab.dkrz.de/k202009/libaec/tags
+  https://gitlab.dkrz.de/k202009/libaec/-/releases
+
+or
+
+  https://github.com/MathisRosenhauer/libaec/releases
 
 ## Developer snapshot
 
+```shell
   git clone https://gitlab.dkrz.de/k202009/libaec.git
-
+```
 
 # Installation
 
@@ -29,10 +34,12 @@ follows:
 
 Unpack the tar archive and change into the unpacked directory.
 
+```shell
   mkdir build
   cd build
   ../configure
   make check install
+```
 
 ## Installation from source code release with CMake
 
@@ -40,21 +47,25 @@ As an alternative, you can use CMake to install libaec.
 
 Unpack the tar archive and change into the unpacked directory.
 
+```shell
   mkdir build
   cd build
   cmake ..
   make install
+```
 
 You can set options for compiling using the CMake GUI by replacing the cmake
 command with
 
+```shell
   cmake-gui ..
+```
 
 or by setting the options manually, e.g.
 
-  cmake -DCMAKE_INSTALL_PREFIX=~/local ..
-
-in order to set the install prefix to ~/local
+```shell
+  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=~/local ..
+```
 
 CMake can also generate project files for Microsoft Visual Studio when
 used in Windows.
@@ -64,6 +75,7 @@ used in Windows.
 The configure script is not included in the repository. You can
 generate it with autotools and gnulib:
 
+```shell
   cd libaec
   gnulib-tool --import lib-symbol-visibility
   autoreconf -iv
@@ -71,7 +83,7 @@ generate it with autotools and gnulib:
   cd build
   ../configure
   make check install
-
+```
 
 # Intel compiler settings
 
@@ -79,8 +91,10 @@ The Intel compiler can improve performance by vectorizing certain
 parts of the code on x86 architectures. Assuming your CPU supports
 AVX2, the following options will increase encoding speed.
 
+```shell
   ../configure CC=icc
   make CFLAGS="-O3 -xCORE-AVX2" bench
+```
 
 On a 3.4 GHz E3-1240 v3 we see more than 400 MiB/s for encoding
 typical data.

Makefile.am

 ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = src tests
 EXTRA_DIST = doc/patent.txt CMakeLists.txt cmake/config.h.in \
+cmake/libaec-config.cmake.in cmake/libaec-config-version.cmake.in \
 INSTALL.md README.md README.SZIP CHANGELOG.md LICENSE.txt data
 
 sampledata = 121B2TestData

README.md

@@ -29,7 +29,7 @@ As stated in section A3 of the current [standard][1]
 
 ## Installation
 
-See [INSTALL](INSTALL) for details.
+See [INSTALL.md](INSTALL.md) for details.
 
 ## SZIP Compatibility
 

cmake/libaec-config.cmake.in

@@ -4,7 +4,7 @@
 # Finds the AEC library, specify the starting search path in libaec_ROOT.
 #
 # Static vs. shared
-# ----------------- 
+# -----------------
 # To make use of the static library instead of the shared one, one needs
 # to set the variable libaec_USE_STATIC_LIBS to ON before calling find_package.
 # Example:
@@ -80,7 +80,7 @@ if (libaec_FOUND)
     IMPORTED_LOCATION "${SZIP_LIBRARY}"
     INTERFACE_INCLUDE_DIRECTORIES "${SZIP_INCLUDE_DIR}"
   )
-  
+
   # Set SZIP variables.
   set(SZIP_FOUND TRUE)
   set(SZIP_LIBRARIES "${SZIP_LIBRARY}")

configure.ac

 AC_PREREQ([2.64])
-AC_INIT([libaec], [1.0.4], [rosenhauer@dkrz.de])
+AC_INIT([libaec], [1.0.5], [rosenhauer@dkrz.de])
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([config])

src/CMakeLists.txt

@@ -21,7 +21,7 @@ add_library(aec_shared SHARED "$<TARGET_OBJECTS:aec>")
 target_link_libraries(aec_shared PUBLIC aec)
 set_target_properties(aec_shared
   PROPERTIES
-  VERSION 0.0.10
+  VERSION 0.0.11
   SOVERSION 0
   OUTPUT_NAME aec
   PUBLIC_HEADER ../include/libaec.h)

src/Makefile.am

@@ -3,7 +3,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -DBUILDING_LIBAEC
 lib_LTLIBRARIES = libaec.la libsz.la
 libaec_la_SOURCES = encode.c encode_accessors.c decode.c \
 encode.h encode_accessors.h decode.h
-libaec_la_LDFLAGS = -version-info 0:10:0 -no-undefined
+libaec_la_LDFLAGS = -version-info 0:11:0 -no-undefined
 
 libsz_la_SOURCES = sz_compat.c
 libsz_la_LIBADD = libaec.la

src/utime.c

@@ -36,10 +36,6 @@
  * Simple timing command, since calling time(1) gives non-portable results.
  *
  */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>