Stop the property tree from keeping a shadow of the deleted input properties, as...

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

diff --git a/src/Input/CMakeLists.txt b/src/Input/CMakeLists.txt
index 27634bc4e14735ad3b8ebbe819c9d69625f3b760..a0031c2cb13a585b376a395ec9d6db3a82f7b73a 100644 (file)
--- a/src/Input/CMakeLists.txt
+++ b/src/Input/CMakeLists.txt
@@ -2,8 +2,12 @@ include(FlightGearComponent)
 
 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()
 
 
@@ -17,37 +21,45 @@ set(SOURCES
        FGMouseInput.cxx
        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})
-       include_directories(${DBUS_INCLUDE_DIR} ${DBUS_ARCH_INCLUDE_DIR})
+       list(APPEND SOURCES ${EVENT_INPUT_HEADERS})
+       include_directories(${UDEV_INCLUDE_DIR})
+       add_definitions(-DWITH_EVENTINPUT)
 endif()
-       
+
 set(FGJS_SOURCES
        fgjs.cxx
        jsinput.cxx
        jssuper.cxx
        )
-       
-add_executable(fgjs ${FGJS_SOURCES})
 
-if(WIN32)
-   set(SOCKETS_LIBRARY wsock32.lib)
-endif(WIN32)
+add_executable(fgjs ${FGJS_SOURCES})
 
 target_link_libraries(fgjs 
-    ${SIMGEAR_CORE_LIBRARIES}
-    ${SOCKETS_LIBRARY}
+       ${SIMGEAR_CORE_LIBRARIES}
        ${PLIB_LIBRARIES}
-       ${ZLIB_LIBRARY})
+       ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES})
 
 add_executable(js_demo js_demo.cxx)
 
 target_link_libraries(js_demo 
        ${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)