From 5181aecc7b87bf638eaec028c9c566ebf38f839d Mon Sep 17 00:00:00 2001 From: James Turner Date: Sat, 21 May 2011 14:56:10 +0100 Subject: [PATCH] Port version-defined-in-a-file logic over from fg. --- CMakeLists.txt | 4 +++- configure.ac | 13 +++++++++---- version | 1 + 3 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 version diff --git a/CMakeLists.txt b/CMakeLists.txt index b2187a49..489be89c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,9 @@ include (CPack) project(SimGear) -set(SIMGEAR_VERSION "2.3.0") +# read 'version' file into a variable (stripping any newlines or spaces) +file(READ version versionFile) +string(STRIP ${versionFile} SIMGEAR_VERSION) #packaging SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/COPYING") diff --git a/configure.ac b/configure.ac index e37cb8ed..9a9b2bb5 100644 --- a/configure.ac +++ b/configure.ac @@ -1,15 +1,17 @@ -dnl Process this file with autoget.sh to produce a working configure +dnl Process this file with autogen.sh to produce a working configure dnl script. -AC_INIT +AC_INIT(SimGear, m4_esyscmd([cat ./version | tr -d '\n']), [http://www.flightgear.org]) + +dnl Ensure touching the version causes autoconf to re-run +AC_SUBST([CONFIGURE_DEPENDENCIES], ['$(top_srcdir)/version']) + AC_CONFIG_SRCDIR([simgear/bucket/newbucket.cxx]) dnl Require at least automake 2.52 AC_PREREQ(2.52) dnl Initialize the automake stuff -AM_INIT_AUTOMAKE(SimGear, 2.3.0) - dnl Specify KAI C++ compiler and flags. dnl Borrowed with slight modification from blitz distribution. AC_ARG_WITH(cxx, @@ -23,6 +25,9 @@ AC_ARG_WITH(cxx, ;; esac ]) +dnl set the $host variable based on local machine/os +AC_CANONICAL_TARGET +AM_INIT_AUTOMAKE([dist-bzip2]) AC_ARG_ENABLE(headless, AS_HELP_STRING([--enable-headless],[Enable only packages for headless build])) diff --git a/version b/version new file mode 100644 index 00000000..276cbf9e --- /dev/null +++ b/version @@ -0,0 +1 @@ +2.3.0 -- 2.39.5