fly/flightgear
1
0
Fork 0
Code Activity

Use existing define to supply version number.

Browse source
This commit is contained in:
ThorstenB 2012-01-31 21:42:37 +01:00
parent 7b83b49260
commit 5f6012802f
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -227,7 +227,9 @@ if(ENABLE_LIBSVN)
endif(ENABLE_LIBSVN) endif(ENABLE_LIBSVN)
find_package(PLIB REQUIRED puaux pu js fnt) find_package(PLIB REQUIRED puaux pu js fnt)
find_package(SimGear 2.7.0 REQUIRED)
# FlightGear and SimGear versions need to match
find_package(SimGear ${FLIGHTGEAR_VERSION} REQUIRED)
if (JPEG_FACTORY) if (JPEG_FACTORY)
# check simgear was built with JPEG-factory support # check simgear was built with JPEG-factory support

2
src/Main/options.cxx
View file

@ -2246,7 +2246,7 @@ void Options::setupRoot()
globals->set_fg_root(root); globals->set_fg_root(root);
// validate it // validate it
static char required_version[] = "2.7.0"; static char required_version[] = FLIGHTGEAR_VERSION;
string base_version = fgBasePackageVersion(); string base_version = fgBasePackageVersion();
if ( !(base_version == required_version) ) { if ( !(base_version == required_version) ) {
// tell the operator how to use this application // tell the operator how to use this application