Use existing define to supply version number.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d2fbd8c20ec317dfc36bb849b1c02213153bdc8..1952d7c86ee47ab9aab2e5fddf8da6d3690abba4 100644 (file)
--- 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 395c851a32fd8864f1a348f73235fffe6104e9cf..2d18b736a9e865d40e11c1322b3f6b8869cfdae4 100644 (file)
--- 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