From 5f6012802f1b3472239b438721204cfb82682494 Mon Sep 17 00:00:00 2001 From: ThorstenB Date: Tue, 31 Jan 2012 21:42:37 +0100 Subject: [PATCH] Use existing define to supply version number. --- CMakeLists.txt | 4 +++- src/Main/options.cxx | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3d2fbd8c2..1952d7c86 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -227,7 +227,9 @@ if(ENABLE_LIBSVN) endif(ENABLE_LIBSVN) 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) # check simgear was built with JPEG-factory support diff --git a/src/Main/options.cxx b/src/Main/options.cxx index 395c851a3..2d18b736a 100644 --- a/src/Main/options.cxx +++ b/src/Main/options.cxx @@ -2246,7 +2246,7 @@ void Options::setupRoot() globals->set_fg_root(root); // validate it - static char required_version[] = "2.7.0"; + static char required_version[] = FLIGHTGEAR_VERSION; string base_version = fgBasePackageVersion(); if ( !(base_version == required_version) ) { // tell the operator how to use this application