fly/flightgear
1
0
Fork 0
Code Activity

Cmake: Remove version.h machinery

Browse source 
Merge this file into config.h, this means we can save an include path
everywhere.
This commit is contained in:
James Turner 2020-08-24 13:29:51 +01:00
parent 6dfbda9bd1
commit 178d1beb80
26 changed files with 24 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -467,12 +467,6 @@ configure_file (
"${PROJECT_BINARY_DIR}/src/Include/config.h" "${PROJECT_BINARY_DIR}/src/Include/config.h"
) )
#and the same for the version header
configure_file (
"${PROJECT_SOURCE_DIR}/src/Include/version.h.cmake-in"
"${PROJECT_BINARY_DIR}/src/Include/version.h"
)
# Setup build.h header, each build # Setup build.h header, each build
include( GenerateBuildInfo ) include( GenerateBuildInfo )

3
src/Add-ons/AddonManager.cxx
View file

@ -17,6 +17,8 @@
// with this program; if not, write to the Free Software Foundation, Inc., // with this program; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#include "config.h"
#include <algorithm> #include <algorithm>
#include <memory> #include <memory>
#include <string> #include <string>
@ -33,7 +35,6 @@
#include <simgear/props/props_io.hxx> #include <simgear/props/props_io.hxx>
#include <simgear/structure/exception.hxx> #include <simgear/structure/exception.hxx>
#include <Include/version.h>
#include <Main/fg_props.hxx> #include <Main/fg_props.hxx>
#include <Main/globals.hxx> #include <Main/globals.hxx>

2
src/GUI/AddonsModel.cxx
View file

@ -18,12 +18,12 @@
// along with this program; if not, write to the Free Software // along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "config.h"
#include <QDebug> #include <QDebug>
#include <QUrl> #include <QUrl>
#include <string> #include <string>
#include <simgear/misc/strutils.hxx> #include <simgear/misc/strutils.hxx>
#include <Include/version.h>
#include "AddonsModel.hxx" #include "AddonsModel.hxx"
#include "Add-ons/AddonMetadataParser.hxx" #include "Add-ons/AddonMetadataParser.hxx"

3
src/GUI/AircraftItemModel.cxx
View file

@ -18,6 +18,8 @@
// along with this program; if not, write to the Free Software // along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "config.h"
#include "AircraftItemModel.hxx" #include "AircraftItemModel.hxx"
#include <QSettings> #include <QSettings>
@ -35,7 +37,6 @@
// FlightGear // FlightGear
#include <Main/globals.hxx> #include <Main/globals.hxx>
#include <Include/version.h>
#include "QmlAircraftInfo.hxx" #include "QmlAircraftInfo.hxx"
#include "FavouriteAircraftData.hxx" #include "FavouriteAircraftData.hxx"

3
src/GUI/InstallSceneryDialog.cxx
View file

@ -18,6 +18,8 @@
// along with this program; if not, write to the Free Software // along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "config.h"
#include "InstallSceneryDialog.hxx" #include "InstallSceneryDialog.hxx"
#include "ui_InstallSceneryDialog.h" #include "ui_InstallSceneryDialog.h"
@ -33,7 +35,6 @@
#include <Main/globals.hxx> #include <Main/globals.hxx>
#include <Main/options.hxx> #include <Main/options.hxx>
#include <Include/version.h>
#include <simgear/io/untar.hxx> #include <simgear/io/untar.hxx>

3
src/GUI/LauncherController.cxx
View file

@ -1,3 +1,5 @@
#include "config.h"
#include "LauncherController.hxx" #include "LauncherController.hxx"
// Qt headers // Qt headers
@ -25,7 +27,6 @@
#include <Main/options.hxx> #include <Main/options.hxx>
#include <Main/fg_init.hxx> #include <Main/fg_init.hxx>
#include <Main/fg_props.hxx> #include <Main/fg_props.hxx>
#include "version.h"
#include "AircraftItemModel.hxx" #include "AircraftItemModel.hxx"
#include "AircraftProxyModel.hxx" #include "AircraftProxyModel.hxx"

2
src/GUI/LauncherMainWindow.cxx
View file

@ -16,8 +16,6 @@
#include <QQmlError> #include <QQmlError>
#include <QQmlFileSelector> #include <QQmlFileSelector>
#include "version.h"
// launcher headers // launcher headers
#include "QtLauncher.hxx" #include "QtLauncher.hxx"
#include "DefaultAircraftLocator.hxx" #include "DefaultAircraftLocator.hxx"

1
src/GUI/LocalAircraftCache.cxx
View file

@ -31,7 +31,6 @@
#include <QSettings> #include <QSettings>
#include <QDebug> #include <QDebug>
#include <Include/version.h>
#include <Main/globals.hxx> #include <Main/globals.hxx>
#include <Main/locale.hxx> #include <Main/locale.hxx>

3
src/GUI/QmlAircraftInfo.cxx
View file

@ -1,3 +1,5 @@
#include "config.h"
#include "QmlAircraftInfo.hxx" #include "QmlAircraftInfo.hxx"
#include <QVariant> #include <QVariant>
@ -10,7 +12,6 @@
#include <simgear/structure/exception.hxx> #include <simgear/structure/exception.hxx>
#include <simgear/props/props_io.hxx> #include <simgear/props/props_io.hxx>
#include <Include/version.h>
#include <Main/globals.hxx> #include <Main/globals.hxx>
#include "LocalAircraftCache.hxx" #include "LocalAircraftCache.hxx"

1
src/GUI/SetupRootDialog.cxx
View file

@ -37,7 +37,6 @@
#include <Main/globals.hxx> #include <Main/globals.hxx>
#include <Main/fg_init.hxx> #include <Main/fg_init.hxx>
#include <Main/options.hxx> #include <Main/options.hxx>
#include <Include/version.h>
#include <Viewer/WindowBuilder.hxx> #include <Viewer/WindowBuilder.hxx>
#include "QtLauncher.hxx" #include "QtLauncher.hxx"

3
src/Include/config_cmake.h.in
View file

@ -24,8 +24,7 @@
#cmakedefine HAVE_MKFIFO #cmakedefine HAVE_MKFIFO
#define VERSION "@FLIGHTGEAR_VERSION@" #define VERSION "@FLIGHTGEAR_VERSION@"
#define FLIGHTGEAR_VERSION "@FLIGHTGEAR_VERSION@"
#define HAVE_VERSION_H 1 // version.h is assumed for CMake builds
#cmakedefine ENABLE_UIUC_MODEL #cmakedefine ENABLE_UIUC_MODEL
#cmakedefine ENABLE_LARCSIM #cmakedefine ENABLE_LARCSIM

6
src/Include/version.h.cmake-in
View file

@ -1,6 +0,0 @@
#define FLIGHTGEAR_VERSION "@FLIGHTGEAR_VERSION@"

5
src/Instrumentation/mk_viii.cxx
View file

@ -51,9 +51,7 @@
# pragma warning( disable: 4355 ) # pragma warning( disable: 4355 )
#endif #endif
#ifdef HAVE_CONFIG_H #include <config.h>
# include <config.h>
#endif
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
@ -82,7 +80,6 @@ using std::string;
#include <Airports/runways.hxx> #include <Airports/runways.hxx>
#include <Airports/airport.hxx> #include <Airports/airport.hxx>
#include <Include/version.h>
#include <Main/fg_props.hxx> #include <Main/fg_props.hxx>
#include <Main/globals.hxx> #include <Main/globals.hxx>
#include "instrument_mgr.hxx" #include "instrument_mgr.hxx"

6
src/Instrumentation/tcas.cxx
View file

@ -84,9 +84,7 @@
# pragma warning( disable: 4355 ) # pragma warning( disable: 4355 )
#endif #endif
#ifdef HAVE_CONFIG_H #include <config.h>
# include <config.h>
#endif
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
@ -106,8 +104,6 @@
using std::string; using std::string;
#include <Include/version.h>
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// debug switches ///////////////////////////////////////////////////////////// // debug switches /////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////

1
src/Main/bootstrap.cxx
View file

@ -59,7 +59,6 @@
#include <Viewer/fgviewer.hxx> #include <Viewer/fgviewer.hxx>
#include "main.hxx" #include "main.hxx"
#include <Include/version.h>
#include <Include/build.h> #include <Include/build.h>
#include <Main/globals.hxx> #include <Main/globals.hxx>
#include <Main/fg_init.hxx> #include <Main/fg_init.hxx>

1
src/Main/fg_init.cxx
View file

@ -136,7 +136,6 @@
#include <Network/DNSClient.hxx> #include <Network/DNSClient.hxx>
#include <Network/fgcom.hxx> #include <Network/fgcom.hxx>
#include <Network/http/httpd.hxx> #include <Network/http/httpd.hxx>
#include <Include/version.h>
#include <Viewer/splash.hxx> #include <Viewer/splash.hxx>
#include <Viewer/CameraGroup.hxx> #include <Viewer/CameraGroup.hxx>

1
src/Main/main.cxx
View file

@ -61,7 +61,6 @@
#include <Viewer/renderer.hxx> #include <Viewer/renderer.hxx>
#include <Viewer/WindowSystemAdapter.hxx> #include <Viewer/WindowSystemAdapter.hxx>
#include <Navaids/NavDataCache.hxx> #include <Navaids/NavDataCache.hxx>
#include <Include/version.h>
#include <Include/build.h> #include <Include/build.h>
#include "fg_commands.hxx" #include "fg_commands.hxx"

1
src/Main/options.cxx
View file

@ -80,7 +80,6 @@
#include "AircraftDirVisitorBase.hxx" #include "AircraftDirVisitorBase.hxx"
#include <osg/Version> #include <osg/Version>
#include <Include/version.h>
#include <Include/build.h> #include <Include/build.h>
#include <simgear/version.h> #include <simgear/version.h>

1
src/Main/sentryIntegration.cxx
View file

@ -25,7 +25,6 @@
#include <simgear/props/props.hxx> #include <simgear/props/props.hxx>
#include <simgear/structure/commands.hxx> #include <simgear/structure/commands.hxx>
#include <Include/version.h>
#include <Main/fg_init.hxx> #include <Main/fg_init.hxx>
#include <Main/fg_props.hxx> #include <Main/fg_props.hxx>
#include <Main/globals.hxx> #include <Main/globals.hxx>

3
src/Network/DNSClient.cxx
View file

@ -18,12 +18,13 @@
// along with this program; if not, write to the Free Software // along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "config.h"
#include "DNSClient.hxx" #include "DNSClient.hxx"
#include <cassert> #include <cassert>
#include <Main/fg_props.hxx> #include <Main/fg_props.hxx>
#include <Include/version.h>
#include <simgear/sg_inlines.h> #include <simgear/sg_inlines.h>

3
src/Network/HTTPClient.cxx
View file

@ -18,12 +18,13 @@
// along with this program; if not, write to the Free Software // along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "config.h"
#include "HTTPClient.hxx" #include "HTTPClient.hxx"
#include <cassert> #include <cassert>
#include <Main/fg_props.hxx> #include <Main/fg_props.hxx>
#include <Include/version.h>
#include <simgear/sg_inlines.h> #include <simgear/sg_inlines.h>

5
src/Network/flarm.cxx
View file

@ -20,9 +20,7 @@
// //
// $Id$ // $Id$
#ifdef HAVE_CONFIG_H #include "config.h"
# include "config.h"
#endif
#include <cstdlib> #include <cstdlib>
#include <cstring> #include <cstring>
@ -37,7 +35,6 @@
#include <FDM/flightProperties.hxx> #include <FDM/flightProperties.hxx>
#include <Main/fg_props.hxx> #include <Main/fg_props.hxx>
#include <Main/globals.hxx> #include <Main/globals.hxx>
#include <Include/version.h>
#include <Include/build.h> #include <Include/build.h>
#include "flarm.hxx" #include "flarm.hxx"

3
src/Network/http/httpd.cxx
View file

@ -18,6 +18,8 @@
// along with this program; if not, write to the Free Software // along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "config.h"
#include "httpd.hxx" #include "httpd.hxx"
#include "HTTPRequest.hxx" #include "HTTPRequest.hxx"
#include "PropertyChangeWebsocket.hxx" #include "PropertyChangeWebsocket.hxx"
@ -31,7 +33,6 @@
#include "NavdbUriHandler.hxx" #include "NavdbUriHandler.hxx"
#include "PropertyChangeObserver.hxx" #include "PropertyChangeObserver.hxx"
#include <Main/fg_props.hxx> #include <Main/fg_props.hxx>
#include <Include/version.h>
#include <mongoose.h> #include <mongoose.h>
#include <cJSON.h> #include <cJSON.h>

6
src/Network/igc.cxx
View file

@ -24,11 +24,7 @@
* "fgfs --igc=file,out,1,OutputFile.igc" * "fgfs --igc=file,out,1,OutputFile.igc"
*/ */
#ifdef HAVE_CONFIG_H #include "config.h"
# include "config.h"
#endif
#include <Include/version.h>
#include <stdio.h> // sprintf #include <stdio.h> // sprintf
#include <simgear/debug/logstream.hxx> #include <simgear/debug/logstream.hxx>

4
test_suite/dataStore.cxx
View file

@ -18,14 +18,14 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "config.h"
#include <iostream> #include <iostream>
#include <simgear/misc/strutils.hxx> #include <simgear/misc/strutils.hxx>
#include <Main/fg_init.hxx> #include <Main/fg_init.hxx>
#include <Include/version.h>
#include "config.h"
#include "dataStore.hxx" #include "dataStore.hxx"

1
utils/fgcom/fgcom_external.hxx
View file

@ -50,7 +50,6 @@ typedef int ssize_t;
#include <signal.h> #include <signal.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "version.h"
#ifndef FGCOM_VERSION #ifndef FGCOM_VERSION
#ifdef FLIGHTGEAR_VERSION #ifdef FLIGHTGEAR_VERSION