Add the hla stuff to the cmake build system.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 08b2cdd1ee4ca68eabc39bceda385a695c3a988d..9505c648055fb40dac566a50fbc4cfadcb918ecd 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,9 +72,9 @@ endif()
 if(EVENT_INPUT)
        message(STATUS "checking event-based Input")
        IF(APPLE)
-               
+
        elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
-               
+
        else()
                message(WARNING "event input is not supported on this platform yet")
        endif()
@@ -163,6 +163,11 @@ endif(HAVE_RT)
 endif(NOT CLOCK_GETTIME_IN_LIBC)
 endif(HAVE_CLOCK_GETTIME)
 
+find_package(RTI)
+if(RTI_FOUND)
+  set(FG_HAVE_HLA 1)
+endif()
+
 if(CMAKE_COMPILER_IS_GNUCXX)
     set(WARNING_FLAGS -Wall)
 endif(CMAKE_COMPILER_IS_GNUCXX)
@@ -185,9 +190,9 @@ endif(WIN32)
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS} ${MSVC_FLAGS} -D_REENTRANT")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS} ${MSVC_FLAGS} -D_REENTRANT")
 
-include_directories(${OPENSCENEGRAPH_INCLUDE_DIRS} 
-    ${Boost_INCLUDE_DIRS} 
-       ${ZLIB_INCLUDE_DIR} 
+include_directories(${OPENSCENEGRAPH_INCLUDE_DIRS}
+    ${Boost_INCLUDE_DIRS}
+       ${ZLIB_INCLUDE_DIR}
     ${ALUT_INCLUDE_DIR}
        ${OPENAL_INCLUDE_DIR}
        ${SIMGEAR_INCLUDE_DIR}

diff --git a/src/Include/config_cmake.h.in b/src/Include/config_cmake.h.in
index 734b4dc5ee67a2357f81402266044b27c7f06fcd..047717038e266e1721c7f0f9846cb716bd132bfe 100644 (file)
--- a/src/Include/config_cmake.h.in
+++ b/src/Include/config_cmake.h.in
@@ -4,17 +4,17 @@
 #cmakedefine ENABLE_SP_FDM
 
 // JSBSim needs this, to switch from standalone to in-FG mode
-#define FGFS 
+#define FGFS
 
 #define PU_USE_NONE // PLIB needs this to avoid linking to GLUT
 
 #cmakedefine ENABLE_PLIB_JOYSTICK
 
 // threads are required (used to be optional)
-#define ENABLE_THREADS 1 
+#define ENABLE_THREADS 1
 
 // audio support is assumed
-#define ENABLE_AUDIO_SUPPORT 1 
+#define ENABLE_AUDIO_SUPPORT 1
 
 #cmakedefine HAVE_SYS_TIME_H
 #cmakedefine HAVE_WINDOWS_H
@@ -33,3 +33,5 @@
 #cmakedefine HAVE_LIBSVN_CLIENT_1
 
 #define PKGLIBDIR "@PKGLIBDIR"
+
+#cmakedefine FG_HAVE_HLA

diff --git a/src/Main/CMakeLists.txt b/src/Main/CMakeLists.txt
index ffc87c85782a03b586f2a123d17a64ea4db7023d..ff4538c2ea7c0d49f99e748ab33a13ad1ec6ac99 100644 (file)
--- a/src/Main/CMakeLists.txt
+++ b/src/Main/CMakeLists.txt
@@ -30,8 +30,17 @@ get_property(FG_LIBS GLOBAL PROPERTY FG_LIBS)
 #message(STATUS "OSG libs ${OPENSCENEGRAPH_LIBRARIES}")
 #message(STATUS "SG libs ${SIMGEAR_LIBRARIES}")
 
+if(RTI_FOUND)
+  find_sg_component(hla13 SIMGEAR_LIBRARIES)
+  find_sg_component(hla SIMGEAR_LIBRARIES)
+  set(HLA_LIBRARIES ${RTI_LIBRARIES})
+else()
+  set(HLA_LIBRARIES "")
+endif()
+
 target_link_libraries(fgfs 
        ${FG_LIBS}
+        ${HLA_LIBRARIES}
        ${SIMGEAR_LIBRARIES}
        ${OPENSCENEGRAPH_LIBRARIES} 
        ${OPENAL_LIBRARY} 

diff --git a/src/Network/CMakeLists.txt b/src/Network/CMakeLists.txt
index c74044e147b900afdcdf4e7508ef492bd32df551..4787fa184e6716814bc393fce939fc4af9172cb6 100644 (file)
--- a/src/Network/CMakeLists.txt
+++ b/src/Network/CMakeLists.txt
@@ -30,3 +30,7 @@ set(SOURCES
        
 flightgear_component(Network "${SOURCES}")
 
+if(RTI_FOUND)
+  add_subdirectory(HLA)
+endif()
+

diff --git a/src/Network/HLA/CMakeLists.txt b/src/Network/HLA/CMakeLists.txt
new file mode 100644 (file)
index 0000000..aeed052
--- /dev/null
+++ b/src/Network/HLA/CMakeLists.txt
@@ -0,0 +1,7 @@
+include(FlightGearComponent)
+
+set(SOURCES
+       hla.cxx
+       )
+       
+flightgear_component(HLA "${SOURCES}")