fly/flightgear
1
0
Fork 0
Code Activity

CMake: Handle osgXR includes implicitly

Browse source 
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.
This commit is contained in:
James Hogan 2022-01-12 23:20:12 +00:00
parent 54699d46aa
commit 31956f1f33
No known key found for this signature in database
GPG key ID: 35CEE4862B1023F2
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeModules/SetupFGFSIncludes.cmake
View file

@ -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

4
CMakeModules/SetupFGFSLibraries.cmake
View file

@ -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)