Andreas Gaeb: fix #222 (JSBSIm reset problems)

[flightgear.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c01dce65559ffc900f6fa49c4b1e41847dc0b9fe..9505c648055fb40dac566a50fbc4cfadcb918ecd 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,33 +72,14 @@ 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()
 else(EVENT_INPUT)
        set(ENABLE_PLIB_JOYSTICK 1)
-
-    message(STATUS "adding runtime JS dependencies")
-    if(APPLE)
-    # resolve frameworks to full paths
-        find_library(IOKIT_LIBRARY IOKit)
-        find_library(CF_LIBRARY CoreFoundation)
-        set(JS_LIBS ${IOKIT_LIBRARY} ${CF_LIBRARY})
-    elseif(WIN32)
-        find_library(WINMM_LIBRARY winmm)
-        set(JS_LIBS ${WINMM_LIBRARY})
-    elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
-        # anything needed here?
-    elseif(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
-        find_library(USBHID_LIBRARY usbhid)
-        # check_function_exists(hidinit)
-        set(JS_LIBS ${USBHID_LIBRARY})
-    else()
-        message(WARNING "Unsupported platform for JS libs")
-    endif()
 endif(EVENT_INPUT)
 
 if (MSVC_3RDPARTY_DIR)
@@ -135,7 +116,7 @@ if(ENABLE_LIBSVN)
        endif(LIBSVN_FOUND)
 endif(ENABLE_LIBSVN)
 
-find_package(PLIB REQUIRED puaux pu fnt)
+find_package(PLIB REQUIRED puaux pu js fnt)
 find_package(SimGear 2.2.0 REQUIRED)
 
 check_include_file(unistd.h HAVE_UNISTD_H)
@@ -182,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)
@@ -204,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}