From 31956f1f338e699bee8ef0c4b7a2716fc6c3da67 Mon Sep 17 00:00:00 2001
From: James Hogan <james@albanarts.com>
Date: Wed, 12 Jan 2022 23:20:12 +0000
Subject: [PATCH] CMake: Handle osgXR includes implicitly

Recent CMake versions automatically add the include paths when
flightgear is linked against the osgXR::osgXR target, and code in
SetupFGFSLibraries.cmake handles older CMake versions. Therefore drop
the osgXR special handling in SetupFGFSIncludes.cmake and handle old
versions in SetupFGFSLibraries.cmake as done for the other libraries.
---
 CMakeModules/SetupFGFSIncludes.cmake  | 4 ----
 CMakeModules/SetupFGFSLibraries.cmake | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMakeModules/SetupFGFSIncludes.cmake b/CMakeModules/SetupFGFSIncludes.cmake
index d47db41a3..d0d625352 100644
--- a/CMakeModules/SetupFGFSIncludes.cmake
+++ b/CMakeModules/SetupFGFSIncludes.cmake
@@ -4,10 +4,6 @@ function(setup_fgfs_includes target)
         target_include_directories(${target} PRIVATE ${PROJECT_SOURCE_DIR}/src/FDM/JSBSim)
     endif()
 
-    if(ENABLE_OSGXR)
-        target_include_directories(${target} PRIVATE ${osgXR_INCLUDE_DIR})
-    endif()
-
     target_include_directories(${target} PRIVATE ${PLIB_INCLUDE_DIR})
     target_include_directories(${target} PRIVATE ${PROJECT_SOURCE_DIR}/3rdparty/cjson)
     # only actually needed for httpd.cxx
diff --git a/CMakeModules/SetupFGFSLibraries.cmake b/CMakeModules/SetupFGFSLibraries.cmake
index ad5a23332..8e69b8801 100644
--- a/CMakeModules/SetupFGFSLibraries.cmake
+++ b/CMakeModules/SetupFGFSLibraries.cmake
@@ -117,6 +117,10 @@ function (setup_fgfs_library_includes target)
         _apply_target_includes(${target} JSBSim)
     endif()    
     
+    if(ENABLE_OSGXR)
+        _apply_target_includes(${target} osgXR::osgXR)
+    endif()
+
     _apply_target_includes(${target} fgsqlite3)
     _apply_target_includes(${target} fgvoicesynth)
     _apply_target_includes(${target} fgembeddedresources)