fly/flightgear
1
0
Fork 0
Code Activity

Rename buildId header file

Browse source 
Avoid the very common name ‘build.h’ in favour of something clearer
and FlightGear specific.
This commit is contained in:
James Turner 2020-08-24 14:32:22 +01:00
parent 178d1beb80
commit cf424e4344
8 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -467,7 +467,7 @@ configure_file (
"${PROJECT_BINARY_DIR}/src/Include/config.h" "${PROJECT_BINARY_DIR}/src/Include/config.h"
) )
# Setup build.h header, each build # Setup flightgearBuildId.h header, each build
include( GenerateBuildInfo ) include( GenerateBuildInfo )
# global includes: these are used by every single target, so we do set them globally # global includes: these are used by every single target, so we do set them globally

2
CMakeModules/GenerateBuildInfo.cmake
View file

@ -2,7 +2,7 @@
add_custom_target( add_custom_target(
buildId buildId
${CMAKE_COMMAND} -D SRC=${CMAKE_SOURCE_DIR} ${CMAKE_COMMAND} -D SRC=${CMAKE_SOURCE_DIR}
-D DST=${CMAKE_BINARY_DIR}/src/Include/build.h -D DST=${CMAKE_BINARY_DIR}/src/Include/flightgearBuildId.h
-P ${CMAKE_SOURCE_DIR}/CMakeModules/buildId.cmake -P ${CMAKE_SOURCE_DIR}/CMakeModules/buildId.cmake
) )

2
CMakeModules/buildId.cmake
View file

@ -17,4 +17,4 @@ else()
set(REVISION "none") set(REVISION "none")
endif() endif()
configure_file (${SRC}/src/Include/build.h.cmake-in ${DST}) configure_file (${SRC}/src/Include/flightgearBuildId.h.cmake-in ${DST})

2
src/Include/build.h.cmake-in → src/Include/flightgearBuildId.h.cmake-in
View file

@ -1,4 +1,4 @@
// template file to produce build.h header // template file to produce flightgearBuildId.h header
// this is produced at build time (not Cmake time) via the special // this is produced at build time (not Cmake time) via the special
// target defined by GenerateBuildInfo.Cmake // target defined by GenerateBuildInfo.Cmake
// this ensures the info is always up to date, which does not happen // this ensures the info is always up to date, which does not happen

2
src/Main/bootstrap.cxx
View file

@ -59,7 +59,7 @@
#include <Viewer/fgviewer.hxx> #include <Viewer/fgviewer.hxx>
#include "main.hxx" #include "main.hxx"
#include <Include/build.h> #include <flightgearBuildId.h>
#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>

2
src/Main/main.cxx
View file

@ -61,7 +61,7 @@
#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/build.h> #include <flightgearBuildId.h>
#include "fg_commands.hxx" #include "fg_commands.hxx"
#include "fg_io.hxx" #include "fg_io.hxx"

2
src/Main/options.cxx
View file

@ -80,7 +80,7 @@
#include "AircraftDirVisitorBase.hxx" #include "AircraftDirVisitorBase.hxx"
#include <osg/Version> #include <osg/Version>
#include <Include/build.h> #include <flightgearBuildId.h>
#include <simgear/version.h> #include <simgear/version.h>
using std::string; using std::string;

2
src/Network/flarm.cxx
View file

@ -35,7 +35,7 @@
#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/build.h> #include <flightgearBuildId.h>
#include "flarm.hxx" #include "flarm.hxx"