From 4c6ef278dca52223a9a76c467676fb39c489528c Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Tue, 25 Jun 2019 18:26:20 -0500 Subject: [PATCH] (#2): Generate a header file with the version number Fixes https://gitlab.com/federicomenaquintero/bzip2/issues/2 --- CMakeLists.txt | 7 +++++++ bz_version.h.in | 1 + bzlib.c | 1 + bzlib_private.h | 2 -- meson.build | 8 ++++++++ 5 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 bz_version.h.in diff --git a/CMakeLists.txt b/CMakeLists.txt index a59ffb3..58fff94 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,6 +16,13 @@ set(LT_AGE 0) set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) include(Version) +set(BZ_VERSION ${PROJECT_VERSION}) +configure_file ( + "${PROJECT_SOURCE_DIR}/bz_version.h.in" + "${PROJECT_BINARY_DIR}/bz_version.h" +) +include_directories("${PROJECT_BINARY_DIR}") + math(EXPR LT_SOVERSION "${LT_CURRENT} - ${LT_AGE}") set(LT_VERSION "${LT_SOVERSION}.${LT_AGE}.${LT_REVISION}") set(PACKAGE_VERSION "${PROJECT_VERSION}") diff --git a/bz_version.h.in b/bz_version.h.in new file mode 100644 index 0000000..1adb1b5 --- /dev/null +++ b/bz_version.h.in @@ -0,0 +1 @@ +#define BZ_VERSION "@BZ_VERSION@" diff --git a/bzlib.c b/bzlib.c index d202f71..ed38356 100644 --- a/bzlib.c +++ b/bzlib.c @@ -29,6 +29,7 @@ */ #include "bzlib_private.h" +#include "bz_version.h" /*---------------------------------------------------*/ diff --git a/bzlib_private.h b/bzlib_private.h index 06ee0b4..48b0614 100644 --- a/bzlib_private.h +++ b/bzlib_private.h @@ -36,8 +36,6 @@ /*-- General stuff. --*/ -#define BZ_VERSION "1.0.6, 6-Sept-2010" - typedef char Char; typedef unsigned char Bool; typedef unsigned char UChar; diff --git a/meson.build b/meson.build index 4672f3a..684d1ad 100644 --- a/meson.build +++ b/meson.build @@ -6,6 +6,14 @@ project( default_options : ['c_std=c89', 'warning_level=1'], ) +conf_data = configuration_data() +conf_data.set('BZ_VERSION', meson.project_version()) +configure_file( + input: 'bz_version.h.in', + output: 'bz_version.h', + configuration: conf_data +) + cc = meson.get_compiler('c') add_project_arguments(cc.get_supported_arguments([ '-Winline',