Port version-defined-in-a-file logic over from fg.

This commit is contained in:
James Turner
2011-05-21 14:56:10 +01:00
parent 0e92cfbd0d
commit 5181aecc7b
3 changed files with 13 additions and 5 deletions
+3 -1
View File
@@ -6,7 +6,9 @@ include (CPack)
project(SimGear) 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 #packaging
SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/COPYING") SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/COPYING")
+9 -4
View File
@@ -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. 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]) AC_CONFIG_SRCDIR([simgear/bucket/newbucket.cxx])
dnl Require at least automake 2.52 dnl Require at least automake 2.52
AC_PREREQ(2.52) AC_PREREQ(2.52)
dnl Initialize the automake stuff dnl Initialize the automake stuff
AM_INIT_AUTOMAKE(SimGear, 2.3.0)
dnl Specify KAI C++ compiler and flags. dnl Specify KAI C++ compiler and flags.
dnl Borrowed with slight modification from blitz distribution. dnl Borrowed with slight modification from blitz distribution.
AC_ARG_WITH(cxx, AC_ARG_WITH(cxx,
@@ -23,6 +25,9 @@ AC_ARG_WITH(cxx,
;; ;;
esac esac
]) ])
dnl set the $host variable based on local machine/os
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE([dist-bzip2])
AC_ARG_ENABLE(headless, AC_ARG_ENABLE(headless,
AS_HELP_STRING([--enable-headless],[Enable only packages for headless build])) AS_HELP_STRING([--enable-headless],[Enable only packages for headless build]))
+1
View File
@@ -0,0 +1 @@
2.3.0