Cmake always generates version.h

- simplify some code as a result

diff --git a/src/Include/config.h-msvc90 b/src/Include/config.h-msvc90
deleted file mode 100644 (file)
index d83c471..0000000
--- a/src/Include/config.h-msvc90
+++ /dev/null
@@ -1,176 +0,0 @@
-/* Special single config.h for MSVC90 build - F. Bouvier - 17 Jan, 2010 */
-
-/* Define if the X Window System is missing or not being used.  */
-#define X_DISPLAY_MISSING 1
-
-/* Define if the CONSOLE output has no ANSI driver (eg no "esc [ ..." seqs.) */
-#define  NO_ANSI_DRIVER
-
-/* Define to empty if the keyword does not work.  */
-/* #undef const */
-
-/* Define if you don't have vprintf but do have _doprnt.  */
-/* #undef HAVE_DOPRNT */
-
-/* Define if you have the vprintf function.  */
-#define HAVE_VPRINTF 1
-
-/* Define to package name - not used? */
-#define PACKAGE "FlightGear"
-
-/* Define to package version - use in main.cxx */
-// define in version.h and no_version.h
-/* #define FLIGHTGEAR_VERSION "MSVC9.0-WIN32-2.0.0" */ 
-
-/* Define as the return type of signal handlers (int or void).  */
-#define RETSIGTYPE void
-
-/* Define to `unsigned' if <sys/types.h> doesn't define.  */
-/* #undef size_t */
-
-/* Define if you have the ANSI C header files.  */
-#define STDC_HEADERS 1
-
-/* Define if you can safely include both <sys/time.h> and <time.h>.  */
-/* #undef TIME_WITH_SYS_TIME */
-
-/* Define if your <sys/time.h> declares struct tm.  */
-#define TM_IN_SYS_TIME 1
-
-/* Define to version number */
-#define VERSION "2.0.0"
-#ifndef  FG_VERSION     /* allow override */
-#define  FG_VERSION     7
-#endif   /* FG_VERSION */
-
-/* Define if compiling on a Winbloze (95, NT, etc.) platform */
-#define WIN32 1
-
-/* Define if you have the GetLocalTime function.  */
-#define HAVE_GETLOCALTIME 1
-
-/* Define if you have the ftime function.  */
-#define HAVE_FTIME 1
-
-/* Define if you have the getitimer function.  */
-/* #define HAVE_GETITIMER 1 */
-
-/* Define if you have the getrusage function.  */
-/* #define HAVE_GETRUSAGE 1 */
-
-/* Define if you have the gettimeofday function.  */
-/* #define HAVE_GETTIMEOFDAY 1 */
-
-/* Define if you have the mktime function.  */
-#define HAVE_MKTIME 1
-
-/* Define if you have the rand function.  */
-#define HAVE_RAND 1
-
-/* Define if you have the random function.  */
-/* #define HAVE_RANDOM 1   */
-
-/* Define if you have the rint function.  */
-/* #define HAVE_RINT 1 */
-
-/* Define if you have the setitimer function.  */
-/* #define HAVE_SETITIMER 1 */
-
-/* Define if you have the signal function.  */
-#define HAVE_SIGNAL 1
-
-/* Define if you have the strstr function.  */
-#define HAVE_STRSTR 1
-
-/* Define if you have the <fcntl.h> header file.  */
-#define HAVE_FCNTL_H 1
-
-/* Define if you have the <getopt.h> header file.  */
-#define HAVE_GETOPT_H 1
-
-/* Define if you have the <malloc.h> header file.  */
-#define HAVE_MALLOC_H 1
-
-/* Define if you have the <stdlib.h> header file.  */
-#define HAVE_STDLIB_H 1
-
-/* Define if you have the <sys/time.h> header file.  */
-/* #define HAVE_SYS_TIME_H 1 */
-
-/* Define if you have the <sys/timeb.h> header file.  */
-#define HAVE_SYS_TIMEB_H 1
-
-/* Define if you have the <unistd.h> header file.  */
-/* #define HAVE_UNISTD_H 1 */
-
-/* Define if you have the <values.h> header file.  */
-/* #define HAVE_VALUES_H 1 */
-
-/* Define if you have the <winbase.h> header file.  */
-#define HAVE_WINBASE_H 1
-
-/* Define if you have the <windows.h> header file.  */
-#define HAVE_WINDOWS_H 1
-
-/* Define if you have the GL library (-lGL).  */
-#define HAVE_LIBGL 1
-
-/* Define if you have the GLU library (-lGLU).  */
-#define HAVE_LIBGLU 1
-
-/* Define if you have the GLcore library (-lGLcore).  */
-/* #undef HAVE_LIBGLCORE */
-
-/* Define if you have the ICE library (-lICE).  */
-/* #define HAVE_LIBICE 1 */
-
-/* Define if you have the MesaGL library (-lMesaGL).  */
-/* #undef HAVE_LIBMESAGL */
-
-/* Define if you have the MesaGLU library (-lMesaGLU).  */
-/* #undef HAVE_LIBMESAGLU */
-
-/* Define if you have the SM library (-lSM).  */
-/* #define HAVE_LIBSM 1 */
-
-/* Define if you have the X11 library (-lX11).  */
-/* #define HAVE_LIBX11 1 */
-
-/* Define if you have the Xext library (-lXext).  */
-/* #define HAVE_LIBXEXT 1 */
-
-/* Define if you have the Xi library (-lXi).  */
-/* #define HAVE_LIBXI 1 */
-
-/* Define if you have the Xmu library (-lXmu).  */
-/* #define HAVE_LIBXMU 1 */
-
-/* Define if you have the Xt library (-lXt).  */
-/* #define HAVE_LIBXT 1 */
-
-/* Define if you have the glut library (-lglut).  */
-#define HAVE_LIBGLUT 1
-
-/* Define if you have the m library (-lm).  */
-#define HAVE_LIBM 1
-
-/* Define if you have the socket library (-lsocket).  */
-/* #undef HAVE_LIBSOCKET */
-
-/* Define if you have the <memory.h> header file.  */
-#define HAVE_MEMORY_H 1
-
-#define HAVE_MEMCPY 1
-
-#define NOMINMAX 1
-
-#ifndef ENABLE_AUDIO_SUPPORT
-#define  ENABLE_AUDIO_SUPPORT
-#endif
-
-#define FG_GLUT_H <GL/glut.h>
-
-#define ENABLE_JSBSIM 1
-#define ENABLE_YASIM 1
-
-// eof - config.h-msvc90 - single flightgear config.h file

diff --git a/src/Include/no_version.h b/src/Include/no_version.h
deleted file mode 100644 (file)
index ad96259..0000000
--- a/src/Include/no_version.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef FG_NO_VERSION_H
-#define FG_NO_VERSION_H
-
-// version.h is generated by the build system for official builds of
-// FlightGear. To avoid complicating the life of regular developers,
-// especially on Windows, we set HAVE_VERSION_H if version.h is generated.
-// If that define is not set, we include this file instead, which provides
-// placeholder values instead.
-
-#define FLIGHTGEAR_VERSION "development " __DATE__
-#define SIMGEAR_VERSION FLIGHTGEAR_VERSION
-
-#define HUDSON_BUILD_NUMBER 0
-#define HUDSON_BUILD_ID "none"
-#define REVISION "unknown"
-
-#endif

diff --git a/src/Include/version.h.in b/src/Include/version.h.in
deleted file mode 100644 (file)
index 035a552..0000000
--- a/src/Include/version.h.in
+++ /dev/null
@@ -1,35 +0,0 @@
-// version.h -- FlightGear version
-//
-// Written by Curtis Olson, started October 2000.
-//
-// Copyright (C) 2000  Curtis L. Olson  - http://www.flightgear.org/~curt
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Library General Public
-// License as published by the Free Software Foundation; either
-// version 2 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Library General Public License for more details.
-//
-// You should have received a copy of the GNU Library General Public
-// License along with this library; if not, write to the
-// Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-// Boston, MA  02110-1301, USA.
-//
-// $Id$
-
-
-#ifndef _FLIGHTGEAR_VERSION_H
-#define _FLIGHTGEAR_VERSION_H
-
-
-#define FLIGHTGEAR_VERSION "@VERSION@"
-
-#define HUDSON_BUILD_NUMBER @HUDSON_BUILD_NUMBER@
-#define HUDSON_BUILD_ID "@HUDSON_BUILD_ID@"
-#define REVISION "@REVISION@"
-
-#endif // _FLIGHTGEAR_VERSION_H

diff --git a/src/Instrumentation/mk_viii.cxx b/src/Instrumentation/mk_viii.cxx
index 9f89dbbb8bdd463375eea844321f6710df3965ef..d14748ce9bfd2408c0faff24bc519eb06eca0a43 100644 (file)
--- a/src/Instrumentation/mk_viii.cxx
+++ b/src/Instrumentation/mk_viii.cxx
@@ -82,13 +82,7 @@ using std::string;
 
 #include <Airports/runways.hxx>
 #include <Airports/airport.hxx>
-
-#if defined( HAVE_VERSION_H ) && HAVE_VERSION_H
-#  include <Include/version.h>
-#else
-#  include <Include/no_version.h>
-#endif
-
+#include <Include/version.h>
 #include <Main/fg_props.hxx>
 #include <Main/globals.hxx>
 #include "instrument_mgr.hxx"

diff --git a/src/Instrumentation/tcas.cxx b/src/Instrumentation/tcas.cxx
index ef2a9a888758ac111541fb92a9dbe97e96fe87cd..91ec0f210d10760cd4bc1539a707e008bec5419f 100644 (file)
--- a/src/Instrumentation/tcas.cxx
+++ b/src/Instrumentation/tcas.cxx
@@ -106,11 +106,7 @@
 
 using std::string;
 
-#if defined( HAVE_VERSION_H ) && HAVE_VERSION_H
-#  include <Include/version.h>
-#else
-#  include <Include/no_version.h>
-#endif
+#include <Include/version.h>
 
 ///////////////////////////////////////////////////////////////////////////////
 // debug switches /////////////////////////////////////////////////////////////

diff --git a/src/Network/igc.cxx b/src/Network/igc.cxx
index 9e74f4972d41aaa5c07cbda9f798af0981a93d64..37b87b0e07216e659dc38a7c37c79e21ebc5b3cb 100644 (file)
--- a/src/Network/igc.cxx
+++ b/src/Network/igc.cxx
@@ -28,11 +28,7 @@
 #  include "config.h"
 #endif
 
-#if defined( HAVE_VERSION_H ) && HAVE_VERSION_H
-#  include <Include/version.h>
-#else
-#  include <Include/no_version.h>
-#endif
+#include <Include/version.h>
 
 #include <stdio.h>  // sprintf
 #include <simgear/debug/logstream.hxx>