From e257909a653b867660df075019a327738aa2979a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20D=C3=BCrrenberger?= Date: Mon, 10 Nov 2014 14:36:44 +0100 Subject: [PATCH] Fixes CMake issues with udev (#734) --- cmake/Modules/FindSFML.cmake | 4 ++-- src/SFML/Window/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/Modules/FindSFML.cmake b/cmake/Modules/FindSFML.cmake index c73366e8..03df4607 100644 --- a/cmake/Modules/FindSFML.cmake +++ b/cmake/Modules/FindSFML.cmake @@ -281,7 +281,7 @@ if(SFML_STATIC_LIBRARIES) if(FIND_SFML_OS_LINUX) find_sfml_dependency(X11_LIBRARY "X11" X11) find_sfml_dependency(XRANDR_LIBRARY "Xrandr" Xrandr) - find_sfml_dependency(UDEV_LIBRARY "UDev" udev) + find_sfml_dependency(UDEV_LIBRARIES "UDev" udev) endif() # update the list @@ -292,7 +292,7 @@ if(SFML_STATIC_LIBRARIES) if(FIND_SFML_OS_FREEBSD) set(SFML_WINDOW_DEPENDENCIES ${SFML_WINDOW_DEPENDENCIES} "usbhid") else() - set(SFML_WINDOW_DEPENDENCIES ${SFML_WINDOW_DEPENDENCIES} ${UDEV_LIBRARY}) + set(SFML_WINDOW_DEPENDENCIES ${SFML_WINDOW_DEPENDENCIES} ${UDEV_LIBRARIES}) endif() elseif(FIND_SFML_OS_MACOSX) set(SFML_WINDOW_DEPENDENCIES ${SFML_WINDOW_DEPENDENCIES} "-framework OpenGL -framework Foundation -framework AppKit -framework IOKit -framework Carbon") diff --git a/src/SFML/Window/CMakeLists.txt b/src/SFML/Window/CMakeLists.txt index edfa4183..3046fec6 100644 --- a/src/SFML/Window/CMakeLists.txt +++ b/src/SFML/Window/CMakeLists.txt @@ -218,7 +218,7 @@ endif() if(SFML_OS_WINDOWS) list(APPEND WINDOW_EXT_LIBS winmm gdi32) elseif(SFML_OS_LINUX) - list(APPEND WINDOW_EXT_LIBS ${X11_X11_LIB} ${X11_Xrandr_LIB} ${UDEV_LIBRARY}) + list(APPEND WINDOW_EXT_LIBS ${X11_X11_LIB} ${X11_Xrandr_LIB} ${UDEV_LIBRARIES}) elseif(SFML_OS_FREEBSD) list(APPEND WINDOW_EXT_LIBS ${X11_X11_LIB} ${X11_Xrandr_LIB} usbhid) elseif(SFML_OS_MACOSX)