diff --git a/test_suite/FGTestApi/CMakeLists.txt b/test_suite/FGTestApi/CMakeLists.txt index 7d3e50847..860ebbf76 100644 --- a/test_suite/FGTestApi/CMakeLists.txt +++ b/test_suite/FGTestApi/CMakeLists.txt @@ -1,6 +1,6 @@ set(TESTSUITE_SOURCES ${TESTSUITE_SOURCES} - ${CMAKE_CURRENT_SOURCE_DIR}/globals.cxx + ${CMAKE_CURRENT_SOURCE_DIR}/testGlobals.cxx ${CMAKE_CURRENT_SOURCE_DIR}/NavDataCache.cxx ${CMAKE_CURRENT_SOURCE_DIR}/PrivateAccessorFDM.cxx ${CMAKE_CURRENT_SOURCE_DIR}/scene_graph.cxx @@ -11,7 +11,7 @@ set(TESTSUITE_SOURCES set(TESTSUITE_HEADERS ${TESTSUITE_HEADERS} - ${CMAKE_CURRENT_SOURCE_DIR}/globals.hxx + ${CMAKE_CURRENT_SOURCE_DIR}/testGlobals.hxx ${CMAKE_CURRENT_SOURCE_DIR}/NavDataCache.hxx ${CMAKE_CURRENT_SOURCE_DIR}/PrivateAccessorFDM.hxx ${CMAKE_CURRENT_SOURCE_DIR}/scene_graph.hxx diff --git a/test_suite/FGTestApi/globals.cxx b/test_suite/FGTestApi/testGlobals.cxx similarity index 99% rename from test_suite/FGTestApi/globals.cxx rename to test_suite/FGTestApi/testGlobals.cxx index fcfa29499..0c8084906 100644 --- a/test_suite/FGTestApi/globals.cxx +++ b/test_suite/FGTestApi/testGlobals.cxx @@ -2,7 +2,7 @@ #include "test_suite/dataStore.hxx" -#include "globals.hxx" +#include "testGlobals.hxx" #include diff --git a/test_suite/FGTestApi/globals.hxx b/test_suite/FGTestApi/testGlobals.hxx similarity index 100% rename from test_suite/FGTestApi/globals.hxx rename to test_suite/FGTestApi/testGlobals.hxx diff --git a/test_suite/system_tests/FDM/testAeroMesh.cxx b/test_suite/system_tests/FDM/testAeroMesh.cxx index e16224029..d2a23423d 100644 --- a/test_suite/system_tests/FDM/testAeroMesh.cxx +++ b/test_suite/system_tests/FDM/testAeroMesh.cxx @@ -1,6 +1,6 @@ #include "testAeroMesh.hxx" -#include "test_suite/FGTestApi/globals.hxx" +#include "test_suite/FGTestApi/testGlobals.hxx" #include "test_suite/FGTestApi/PrivateAccessorFDM.hxx" #include "test_suite/FGTestApi/scene_graph.hxx" diff --git a/test_suite/unit_tests/Add-ons/test_AddonManagement.cxx b/test_suite/unit_tests/Add-ons/test_AddonManagement.cxx index d2b4eaca6..ff4cf7f05 100644 --- a/test_suite/unit_tests/Add-ons/test_AddonManagement.cxx +++ b/test_suite/unit_tests/Add-ons/test_AddonManagement.cxx @@ -21,7 +21,7 @@ #include "test_AddonManagement.hxx" #include "config.h" -#include "test_suite/FGTestApi/globals.hxx" +#include "test_suite/FGTestApi/testGlobals.hxx" #include #include diff --git a/test_suite/unit_tests/Input/test_hidinput.cxx b/test_suite/unit_tests/Input/test_hidinput.cxx index 0a58d1143..b7fa1cc90 100644 --- a/test_suite/unit_tests/Input/test_hidinput.cxx +++ b/test_suite/unit_tests/Input/test_hidinput.cxx @@ -20,7 +20,7 @@ #include "test_hidinput.hxx" -#include "test_suite/FGTestApi/globals.hxx" +#include "test_suite/FGTestApi/testGlobals.hxx" #include diff --git a/test_suite/unit_tests/Instrumentation/test_gps.cxx b/test_suite/unit_tests/Instrumentation/test_gps.cxx index 95a36738e..dbc37fb8d 100644 --- a/test_suite/unit_tests/Instrumentation/test_gps.cxx +++ b/test_suite/unit_tests/Instrumentation/test_gps.cxx @@ -22,7 +22,7 @@ #include #include -#include "test_suite/FGTestApi/globals.hxx" +#include "test_suite/FGTestApi/testGlobals.hxx" #include "test_suite/FGTestApi/NavDataCache.hxx" #include "test_suite/FGTestApi/TestPilot.hxx" diff --git a/test_suite/unit_tests/Instrumentation/test_hold_controller.cxx b/test_suite/unit_tests/Instrumentation/test_hold_controller.cxx index 9e723ea26..8213f977d 100644 --- a/test_suite/unit_tests/Instrumentation/test_hold_controller.cxx +++ b/test_suite/unit_tests/Instrumentation/test_hold_controller.cxx @@ -22,7 +22,7 @@ #include #include -#include "test_suite/FGTestApi/globals.hxx" +#include "test_suite/FGTestApi/testGlobals.hxx" #include "test_suite/FGTestApi/NavDataCache.hxx" #include "test_suite/FGTestApi/TestPilot.hxx" diff --git a/test_suite/unit_tests/Instrumentation/test_navRadio.cxx b/test_suite/unit_tests/Instrumentation/test_navRadio.cxx index a41232387..27697eca4 100644 --- a/test_suite/unit_tests/Instrumentation/test_navRadio.cxx +++ b/test_suite/unit_tests/Instrumentation/test_navRadio.cxx @@ -3,7 +3,7 @@ #include #include -#include "test_suite/FGTestApi/globals.hxx" +#include "test_suite/FGTestApi/testGlobals.hxx" #include "test_suite/FGTestApi/NavDataCache.hxx" #include diff --git a/test_suite/unit_tests/Main/test_autosaveMigration.cxx b/test_suite/unit_tests/Main/test_autosaveMigration.cxx index c420c7d3a..bbdbd6828 100644 --- a/test_suite/unit_tests/Main/test_autosaveMigration.cxx +++ b/test_suite/unit_tests/Main/test_autosaveMigration.cxx @@ -20,7 +20,7 @@ #include "test_autosaveMigration.hxx" -#include "test_suite/FGTestApi/globals.hxx" +#include "test_suite/FGTestApi/testGlobals.hxx" #include #include diff --git a/test_suite/unit_tests/Main/test_posinit.cxx b/test_suite/unit_tests/Main/test_posinit.cxx index cbe56f21b..10715cf60 100644 --- a/test_suite/unit_tests/Main/test_posinit.cxx +++ b/test_suite/unit_tests/Main/test_posinit.cxx @@ -18,7 +18,7 @@ #include "test_posinit.hxx" -#include "test_suite/FGTestApi/globals.hxx" +#include "test_suite/FGTestApi/testGlobals.hxx" #include "test_suite/FGTestApi/NavDataCache.hxx" #include diff --git a/test_suite/unit_tests/Navaids/test_aircraftPerformance.cxx b/test_suite/unit_tests/Navaids/test_aircraftPerformance.cxx index 871eeea2d..1a8b27532 100644 --- a/test_suite/unit_tests/Navaids/test_aircraftPerformance.cxx +++ b/test_suite/unit_tests/Navaids/test_aircraftPerformance.cxx @@ -1,6 +1,6 @@ #include "test_aircraftPerformance.hxx" -#include "test_suite/FGTestApi/globals.hxx" +#include "test_suite/FGTestApi/testGlobals.hxx" #include "test_suite/FGTestApi/NavDataCache.hxx" #include diff --git a/test_suite/unit_tests/Navaids/test_flightplan.cxx b/test_suite/unit_tests/Navaids/test_flightplan.cxx index 0e3571c71..3a0f194e9 100644 --- a/test_suite/unit_tests/Navaids/test_flightplan.cxx +++ b/test_suite/unit_tests/Navaids/test_flightplan.cxx @@ -1,6 +1,6 @@ #include "test_flightplan.hxx" -#include "test_suite/FGTestApi/globals.hxx" +#include "test_suite/FGTestApi/testGlobals.hxx" #include "test_suite/FGTestApi/NavDataCache.hxx" #include diff --git a/test_suite/unit_tests/Navaids/test_navaids2.cxx b/test_suite/unit_tests/Navaids/test_navaids2.cxx index d0f3cc380..5743be1b6 100644 --- a/test_suite/unit_tests/Navaids/test_navaids2.cxx +++ b/test_suite/unit_tests/Navaids/test_navaids2.cxx @@ -1,6 +1,6 @@ #include "test_navaids2.hxx" -#include "test_suite/FGTestApi/globals.hxx" +#include "test_suite/FGTestApi/testGlobals.hxx" #include "test_suite/FGTestApi/NavDataCache.hxx" #include diff --git a/test_suite/unit_tests/Navaids/test_routeManager.cxx b/test_suite/unit_tests/Navaids/test_routeManager.cxx index 8b95549ea..b5a01f8f0 100644 --- a/test_suite/unit_tests/Navaids/test_routeManager.cxx +++ b/test_suite/unit_tests/Navaids/test_routeManager.cxx @@ -3,7 +3,7 @@ #include #include -#include "test_suite/FGTestApi/globals.hxx" +#include "test_suite/FGTestApi/testGlobals.hxx" #include "test_suite/FGTestApi/NavDataCache.hxx" #include "test_suite/FGTestApi/TestPilot.hxx"