X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FInput%2FCMakeLists.txt;h=11b277ef2fb2777511a3684aee4c8dfbe6424be0;hb=239a0007631da53c68ca9c8e7989957c567acac9;hp=1a2df52d269614a08bc4a125d5b011f5ca58f6fa;hpb=2ef1e5be521fffae3f8ce73b4ef09351ce516852;p=flightgear.git

diff --git a/src/Input/CMakeLists.txt b/src/Input/CMakeLists.txt
index 1a2df52d2..11b277ef2 100644
--- 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()
 
 
@@ -15,39 +19,52 @@ set(SOURCES
 	FGJoystickInput.cxx
 	FGKeyboardInput.cxx
 	FGMouseInput.cxx
-	input.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})
 endif()
-	
-set(FGJS_SOURCES
-	fgjs.cxx
-	jsinput.cxx
-	jssuper.cxx
-	)
-	
-add_executable(fgjs ${FGJS_SOURCES})
 
-if(WIN32)
-   set(SOCKETS_LIBRARY wsock32.lib)
-endif(WIN32)
+if(ENABLE_FGJS)
+    set(FGJS_SOURCES
+        fgjs.cxx
+        jsinput.cxx
+        jssuper.cxx
+    )
 
-target_link_libraries(fgjs 
-    ${SOCKETS_LIBRARY}
-	${SIMGEAR_LIBRARIES}
-	${PLIB_LIBRARIES}
-	${ZLIB_LIBRARY})
+    add_executable(fgjs ${FGJS_SOURCES})
+    target_link_libraries(fgjs
+        ${SIMGEAR_CORE_LIBRARIES}
+        ${PLIB_LIBRARIES}
+        ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
+    )
 
-add_executable(js_demo js_demo.cxx)
+    install(TARGETS fgjs RUNTIME DESTINATION bin)
+endif()
 
-target_link_libraries(js_demo 
-	${SIMGEAR_LIBRARIES}
-	${PLIB_LIBRARIES}
-	${ZLIB_LIBRARY})
+if(ENABLE_JS_DEMO)
+    add_executable(js_demo js_demo.cxx)
+    target_link_libraries(js_demo
+        ${SIMGEAR_CORE_LIBRARIES}
+        ${PLIB_LIBRARIES}
+        ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
+    )
 
-flightgear_component(Input "${SOURCES}")
+    install(TARGETS js_demo RUNTIME DESTINATION bin)
+endif()
 
-install(TARGETS fgjs js_demo RUNTIME DESTINATION bin)
+flightgear_component(Input "${SOURCES}" "${HEADERS}")
\ No newline at end of file