diff --git a/src/SFML/Window/CMakeLists.txt b/src/SFML/Window/CMakeLists.txt
index e1bff7d77..c90639a79 100644
--- a/src/SFML/Window/CMakeLists.txt
+++ b/src/SFML/Window/CMakeLists.txt
@@ -196,6 +196,8 @@ if(NOT SFML_OPENGL_ES)
             message(FATAL_ERROR "Xrandr library not found")
         endif()
         include_directories(${X11_INCLUDE_DIR})
+    endif()
+    if(SFML_OS_LINUX)
         find_package(UDev REQUIRED)
         if(NOT UDEV_FOUND)
             message(FATAL_ERROR "udev library not found")
@@ -212,11 +214,10 @@ endif()
 # build the list of external libraries to link
 if(SFML_OS_WINDOWS)
     list(APPEND WINDOW_EXT_LIBS winmm gdi32)
-elseif(SFML_OS_LINUX OR SFML_OS_FREEBSD)
+elseif(SFML_OS_LINUX)
     list(APPEND WINDOW_EXT_LIBS ${X11_X11_LIB} ${X11_Xrandr_LIB} ${UDEV_LIBRARIES})
-    if(SFML_OS_FREEBSD)
-        list(APPEND WINDOW_EXT_LIBS usbhid)
-    endif()
+elseif(SFML_OS_FREEBSD)
+    list(APPEND WINDOW_EXT_LIBS ${X11_X11_LIB} ${X11_Xrandr_LIB} usbhid)
 elseif(SFML_OS_MACOSX)
     list(APPEND WINDOW_EXT_LIBS "-framework Foundation -framework AppKit -framework IOKit -framework Carbon")
 elseif(SFML_OS_IOS)