From cf424e4344fd9b5177fc7494f3ee41aca9bfad89 Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Mon, 24 Aug 2020 14:32:22 +0100
Subject: [PATCH] Rename buildId header file
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Avoid the very common name ‘build.h’ in favour of something clearer
and FlightGear specific.
---
 CMakeLists.txt                                                 | 2 +-
 CMakeModules/GenerateBuildInfo.cmake                           | 2 +-
 CMakeModules/buildId.cmake                                     | 2 +-
 src/Include/{build.h.cmake-in => flightgearBuildId.h.cmake-in} | 2 +-
 src/Main/bootstrap.cxx                                         | 2 +-
 src/Main/main.cxx                                              | 2 +-
 src/Main/options.cxx                                           | 2 +-
 src/Network/flarm.cxx                                          | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)
 rename src/Include/{build.h.cmake-in => flightgearBuildId.h.cmake-in} (89%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e2432bd2a..38c51f64c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -467,7 +467,7 @@ configure_file (
     "${PROJECT_BINARY_DIR}/src/Include/config.h"
 )
 
-# Setup build.h header, each build
+# Setup flightgearBuildId.h header, each build
 include( GenerateBuildInfo )
 
 # global includes: these are used by every single target, so we do set them globally
diff --git a/CMakeModules/GenerateBuildInfo.cmake b/CMakeModules/GenerateBuildInfo.cmake
index 88ba48090..038a80670 100644
--- a/CMakeModules/GenerateBuildInfo.cmake
+++ b/CMakeModules/GenerateBuildInfo.cmake
@@ -2,7 +2,7 @@
 add_custom_target(
   buildId
   ${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
 )
 
diff --git a/CMakeModules/buildId.cmake b/CMakeModules/buildId.cmake
index 3396a0b95..2ead23f84 100644
--- a/CMakeModules/buildId.cmake
+++ b/CMakeModules/buildId.cmake
@@ -17,4 +17,4 @@ else()
     set(REVISION "none")
 endif()
 
-configure_file (${SRC}/src/Include/build.h.cmake-in ${DST})
\ No newline at end of file
+configure_file (${SRC}/src/Include/flightgearBuildId.h.cmake-in ${DST})
\ No newline at end of file
diff --git a/src/Include/build.h.cmake-in b/src/Include/flightgearBuildId.h.cmake-in
similarity index 89%
rename from src/Include/build.h.cmake-in
rename to src/Include/flightgearBuildId.h.cmake-in
index 2e61c8e7a..2e7b97322 100644
--- a/src/Include/build.h.cmake-in
+++ b/src/Include/flightgearBuildId.h.cmake-in
@@ -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
 // target defined by GenerateBuildInfo.Cmake
 // this ensures the info is always up to date, which does not happen
diff --git a/src/Main/bootstrap.cxx b/src/Main/bootstrap.cxx
index df7aa5d7d..70b9b5097 100644
--- a/src/Main/bootstrap.cxx
+++ b/src/Main/bootstrap.cxx
@@ -59,7 +59,7 @@
 
 #include <Viewer/fgviewer.hxx>
 #include "main.hxx"
-#include <Include/build.h>
+#include <flightgearBuildId.h>
 #include <Main/globals.hxx>
 #include <Main/fg_init.hxx>
 #include <Main/options.hxx>
diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index c48c054fb..5078e1357 100755
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -61,7 +61,7 @@
 #include <Viewer/renderer.hxx>
 #include <Viewer/WindowSystemAdapter.hxx>
 #include <Navaids/NavDataCache.hxx>
-#include <Include/build.h>
+#include <flightgearBuildId.h>
 
 #include "fg_commands.hxx"
 #include "fg_io.hxx"
diff --git a/src/Main/options.cxx b/src/Main/options.cxx
index 76ece0962..3b45c884d 100644
--- a/src/Main/options.cxx
+++ b/src/Main/options.cxx
@@ -80,7 +80,7 @@
 #include "AircraftDirVisitorBase.hxx"
 
 #include <osg/Version>
-#include <Include/build.h>
+#include <flightgearBuildId.h>
 #include <simgear/version.h>
 
 using std::string;
diff --git a/src/Network/flarm.cxx b/src/Network/flarm.cxx
index aeeeced33..07541b58a 100644
--- a/src/Network/flarm.cxx
+++ b/src/Network/flarm.cxx
@@ -35,7 +35,7 @@
 #include <FDM/flightProperties.hxx>
 #include <Main/fg_props.hxx>
 #include <Main/globals.hxx>
-#include <Include/build.h>
+#include <flightgearBuildId.h>
 
 #include "flarm.hxx"