From 4bab064ad6a8a1b66355b08bdc7dcd9de0b6a76c Mon Sep 17 00:00:00 2001
From: gallaert <gaetan.allaert@belgacom.net>
Date: Sun, 15 Mar 2020 22:29:43 +0000
Subject: [PATCH] - When HLA is enabled in Simgear, HLA is also enabled in
 Flightgear   making the build between Simgear and Flightgear consistent. -
 Fix an issue with lib/lib64 path between CentOS/RedHat distributions   and
 Debian derived distributions.

---
 CMakeLists.txt         |  3 +--
 SimGearConfig.cmake.in | 10 ++++++++++
 simgear/CMakeLists.txt |  2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index eef5e2cc..6c7ee245 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -294,11 +294,10 @@ endif()
 if(ENABLE_RTI)
     find_package(PkgConfig)
     if(PKG_CONFIG_FOUND)
-      SET(ENV{PKG_CONFIG_PATH} "${CMAKE_INSTALL_PREFIX}/${_LIBDIR_DEFAULT}/pkgconfig:$ENV{PKG_CONFIG_PATH}")
+      SET(ENV{PKG_CONFIG_PATH} "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig:$ENV{PKG_CONFIG_PATH}")
       pkg_check_modules(RTI hla-rti13)
     endif(PKG_CONFIG_FOUND)
     if(RTI_FOUND)
-      SET(RTI_INCLUDE_DIR "${RTI_INCLUDE_DIRS}")
       message(STATUS "RTI: ENABLED")
     else()
       message(STATUS "RTI: DISABLED")
diff --git a/SimGearConfig.cmake.in b/SimGearConfig.cmake.in
index 71be04cd..3b51d4d6 100644
--- a/SimGearConfig.cmake.in
+++ b/SimGearConfig.cmake.in
@@ -18,6 +18,16 @@ set(USE_AEONWAVE @USE_AEONWAVE@)
 
 set(ENABLE_SIMD @ENABLE_SIMD@)
 
+# OpenRTI support
+set(ENABLE_RTI @ENABLE_RTI@)
+if(ENABLE_RTI)
+  set(RTI_FOUND @RTI_FOUND@)
+  if(RTI_FOUND)
+    set(RTI_INCLUDE_DIRS @RTI_INCLUDE_DIRS@)
+    set(RTI_LDFLAGS @RTI_LDFLAGS@)
+  endif(RTI_FOUND)
+endif(ENABLE_RTI)
+
 # Alternative terrain engine based on pagedLOD
 
 set(ENABLE_GDAL @ENABLE_GDAL@)
diff --git a/simgear/CMakeLists.txt b/simgear/CMakeLists.txt
index 7646ac09..92cb7bab 100644
--- a/simgear/CMakeLists.txt
+++ b/simgear/CMakeLists.txt
@@ -201,5 +201,5 @@ if(ENABLE_RTI)
     set_property(SOURCE hla/RTI13InteractionClass.cxx hla/RTI13ObjectClass.cxx
         hla/RTI13ObjectInstance.cxx hla/RTI13Federate.cxx
         hla/RTI13FederateFactory.cxx
-        APPEND PROPERTY COMPILE_FLAGS "-I${RTI_INCLUDE_DIR}")
+        APPEND PROPERTY COMPILE_FLAGS "-I${RTI_INCLUDE_DIRS}")
 endif(ENABLE_RTI)