Merge branch 'attenuation' into navaids-radio

[flightgear.git] / src / Input / CMakeLists.txt

diff --git a/src/Input/CMakeLists.txt b/src/Input/CMakeLists.txt
index e0d6abd30ca1065516d7ad69bec3f301bab9c545..b38ffc8cb7aaef23965181a0603d46c68888936c 100644 (file)
--- a/src/Input/CMakeLists.txt
+++ b/src/Input/CMakeLists.txt
@@ -1,9 +1,15 @@
 include(FlightGearComponent)
 
-set(EVENT_INPUT_SOURCES
-       FGLinuxEventInput.cxx
-       FGMacOSXEventInput.cxx
-       )
+IF(APPLE)
+       set(EVENT_INPUT_SOURCES FGMacOSXEventInput.cxx)
+       set(EVENT_INPUT_HEADERS FGMacOSXEventInput.hxx)
+elseif(MSVC)
+    message(STATUS "EventInput not implemented for Windows yet")
+else()
+       set(EVENT_INPUT_SOURCES FGLinuxEventInput.cxx)
+       set(EVENT_INPUT_HEADERS FGLinuxEventInput.hxx)
+endif()
+
 
 set(SOURCES
        FGButton.cxx
@@ -16,8 +22,21 @@ set(SOURCES
        input.cxx       
        )
        
+set(HEADERS
+       FGButton.hxx
+    FGCommonInput.hxx
+    FGDeviceConfigurationMap.hxx
+    FGEventInput.hxx
+    FGJoystickInput.hxx
+    FGKeyboardInput.hxx
+    FGMouseInput.hxx
+    input.hxx
+       )
+       
 if(EVENT_INPUT)
        list(APPEND SOURCES ${EVENT_INPUT_SOURCES})
+       list(APPEND SOURCES ${EVENT_INPUT_HEADERS})
+       include_directories(${DBUS_INCLUDE_DIR} ${DBUS_ARCH_INCLUDE_DIR})
 endif()
        
 set(FGJS_SOURCES
@@ -28,23 +47,18 @@ set(FGJS_SOURCES
        
 add_executable(fgjs ${FGJS_SOURCES})
 
-if(WIN32)
-   set(SOCKETS_LIBRARY wsock32.lib)
-endif(WIN32)
-
 target_link_libraries(fgjs 
-    ${SOCKETS_LIBRARY}
-       ${SIMGEAR_LIBRARIES}
-       ${PLIB_LIBRARIES}
-       ${ZLIB_LIBRARY})
+    ${SIMGEAR_CORE_LIBRARIES}
+    ${PLIB_LIBRARIES}
+    ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES})
 
 add_executable(js_demo js_demo.cxx)
 
 target_link_libraries(js_demo 
-       ${SIMGEAR_LIBRARIES}
+       ${SIMGEAR_CORE_LIBRARIES}
        ${PLIB_LIBRARIES}
-       ${ZLIB_LIBRARY})
+       ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES})
 
-flightgear_component(Input "${SOURCES}")
+flightgear_component(Input "${SOURCES}" "${HEADERS}")
 
 install(TARGETS fgjs js_demo RUNTIME DESTINATION bin)