Skip to content
Snippets Groups Projects
Commit 79d96eba authored by Mathis Rosenhauer's avatar Mathis Rosenhauer
Browse files

Put version information in libaec.h

parent 83757d8e
No related branches found
Tags v1.0.2
1 merge request!2Resolve "Query version of libaec"
...@@ -38,6 +38,11 @@ configure_file( ...@@ -38,6 +38,11 @@ configure_file(
"cmake/config.h.in" "cmake/config.h.in"
"${CMAKE_CURRENT_BINARY_DIR}/config.h") "${CMAKE_CURRENT_BINARY_DIR}/config.h")
# Create libaec.h with current version information
configure_file(
"include/libaec.h.in"
"${CMAKE_CURRENT_BINARY_DIR}/include/libaec.h")
add_subdirectory(src) add_subdirectory(src)
if(BUILD_TESTING) if(BUILD_TESTING)
add_subdirectory(tests) add_subdirectory(tests)
...@@ -89,6 +94,7 @@ endif() ...@@ -89,6 +94,7 @@ endif()
set(CPACK_SOURCE_IGNORE_FILES set(CPACK_SOURCE_IGNORE_FILES
/.git /.git
/.*build.* /.*build.*
/*.cache
.*~ .*~
.*\#.*\# .*\#.*\#
\..*\#.*) \..*\#.*)
......
AC_PREREQ([2.64]) AC_PREREQ([2.64])
AC_INIT([libaec], [1.0.6], [rosenhauer@dkrz.de])
m4_define([VERSION_MAJOR], [1])
m4_define([VERSION_MINOR], [0])
m4_define([VERSION_PATCH], [6])
AC_INIT([libaec], [VERSION_MAJOR.VERSION_MINOR.VERSION_PATCH], [rosenhauer@dkrz.de])
AC_SUBST(PROJECT_VERSION_MAJOR, [VERSION_MAJOR])
AC_SUBST(PROJECT_VERSION_MINOR, [VERSION_MINOR])
AC_SUBST(PROJECT_VERSION_PATCH, [VERSION_PATCH])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR([config]) AC_CONFIG_AUX_DIR([config])
...@@ -30,5 +39,5 @@ AC_CHECK_DECLS(__builtin_clzll) ...@@ -30,5 +39,5 @@ AC_CHECK_DECLS(__builtin_clzll)
AM_EXTRA_RECURSIVE_TARGETS([bench benc bdec]) AM_EXTRA_RECURSIVE_TARGETS([bench benc bdec])
AC_CONFIG_FILES([Makefile src/Makefile tests/Makefile]) AC_CONFIG_FILES([Makefile src/Makefile tests/Makefile include/libaec.h])
AC_OUTPUT AC_OUTPUT
...@@ -38,6 +38,11 @@ ...@@ -38,6 +38,11 @@
#ifndef LIBAEC_H #ifndef LIBAEC_H
#define LIBAEC_H 1 #define LIBAEC_H 1
#define AEC_VERSION_MAJOR @PROJECT_VERSION_MAJOR@
#define AEC_VERSION_MINOR @PROJECT_VERSION_MINOR@
#define AEC_VERSION_PATCH @PROJECT_VERSION_PATCH@
#define AEC_VERSION_STR "@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@"
#include <stddef.h> #include <stddef.h>
#ifdef __cplusplus #ifdef __cplusplus
......
...@@ -24,7 +24,7 @@ set_target_properties(aec_shared ...@@ -24,7 +24,7 @@ set_target_properties(aec_shared
VERSION 0.0.12 VERSION 0.0.12
SOVERSION 0 SOVERSION 0
OUTPUT_NAME aec OUTPUT_NAME aec
PUBLIC_HEADER ../include/libaec.h) PUBLIC_HEADER ${CMAKE_CURRENT_BINARY_DIR}/../include/libaec.h)
# Wrapper for compatibility with szip # Wrapper for compatibility with szip
add_library(sz OBJECT sz_compat.c) add_library(sz OBJECT sz_compat.c)
......
...@@ -9,7 +9,7 @@ libsz_la_SOURCES = sz_compat.c ...@@ -9,7 +9,7 @@ libsz_la_SOURCES = sz_compat.c
libsz_la_LIBADD = libaec.la libsz_la_LIBADD = libaec.la
libsz_la_LDFLAGS = -version-info 2:1:0 -no-undefined libsz_la_LDFLAGS = -version-info 2:1:0 -no-undefined
include_HEADERS = $(top_srcdir)/include/libaec.h $(top_srcdir)/include/szlib.h include_HEADERS = $(top_builddir)/include/libaec.h $(top_srcdir)/include/szlib.h
bin_PROGRAMS = aec bin_PROGRAMS = aec
noinst_PROGRAMS = utime noinst_PROGRAMS = utime
......
...@@ -10,13 +10,13 @@ check_PROGRAMS = check_code_options check_buffer_sizes check_long_fs \ ...@@ -10,13 +10,13 @@ check_PROGRAMS = check_code_options check_buffer_sizes check_long_fs \
check_szcomp check_szcomp
check_code_options_SOURCES = check_code_options.c check_aec.h \ check_code_options_SOURCES = check_code_options.c check_aec.h \
$(top_srcdir)/include/libaec.h $(top_builddir)/include/libaec.h
check_buffer_sizes_SOURCES = check_buffer_sizes.c check_aec.h \ check_buffer_sizes_SOURCES = check_buffer_sizes.c check_aec.h \
$(top_srcdir)/include/libaec.h $(top_builddir)/include/libaec.h
check_long_fs_SOURCES = check_long_fs.c check_aec.h \ check_long_fs_SOURCES = check_long_fs.c check_aec.h \
$(top_srcdir)/include/libaec.h $(top_builddir)/include/libaec.h
check_szcomp_SOURCES = check_szcomp.c $(top_srcdir)/include/szlib.h check_szcomp_SOURCES = check_szcomp.c $(top_srcdir)/include/szlib.h
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment