From 293d6b35655f86e6f209d2767f42bf0621ef3cb2 Mon Sep 17 00:00:00 2001 From: ThorstenB Date: Sat, 22 Sep 2012 14:20:49 +0200 Subject: [PATCH] Fix compilation with enabled EVENT_INPUT Need to move the definition to the toplevel cmake file, since sources are no longer compiled on directory level (individual libs per dir). --- CMakeLists.txt | 1 + src/Input/CMakeLists.txt | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 47519337c..3fd2b3e2a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -132,6 +132,7 @@ if(EVENT_INPUT) message(WARNING "UDev not found, event input is disabled!") set(EVENT_INPUT 0) else() + add_definitions(-DWITH_EVENTINPUT) set(EVENT_INPUT_LIBRARIES ${UDEV_LIBRARIES}) message(STATUS "event-based input enabled. Using ${UDEV_LIBRARIES}") endif() diff --git a/src/Input/CMakeLists.txt b/src/Input/CMakeLists.txt index a0031c2cb..009929dce 100644 --- a/src/Input/CMakeLists.txt +++ b/src/Input/CMakeLists.txt @@ -19,7 +19,7 @@ set(SOURCES FGJoystickInput.cxx FGKeyboardInput.cxx FGMouseInput.cxx - input.cxx + input.cxx ) set(HEADERS @@ -37,7 +37,6 @@ if(EVENT_INPUT) list(APPEND SOURCES ${EVENT_INPUT_SOURCES}) list(APPEND SOURCES ${EVENT_INPUT_HEADERS}) include_directories(${UDEV_INCLUDE_DIR}) - add_definitions(-DWITH_EVENTINPUT) endif() set(FGJS_SOURCES