diff --git a/NativeApp/CMakeLists.txt b/NativeApp/CMakeLists.txt
index f2a3a991..2dca59be 100644
--- a/NativeApp/CMakeLists.txt
+++ b/NativeApp/CMakeLists.txt
@@ -463,18 +463,20 @@ elseif(PLATFORM_ANDROID)
         include/Android
     )
 elseif(PLATFORM_LINUX)
+    find_package(X11 REQUIRED)
     target_link_libraries(Diligent-NativeAppBase 
     PRIVATE 
-        X11
+        X11::X11
     )
     target_include_directories(Diligent-NativeAppBase 
     PUBLIC 
         include/Linux
     )
     if(VULKAN_SUPPORTED)
+        find_library(XCB_LIBRARY xcb)
         target_link_libraries(Diligent-NativeAppBase
         PRIVATE 
-            xcb
+            ${XCB_LIBRARY}
         )
     endif()
 elseif(PLATFORM_MACOS)
diff --git a/NativeApp/Linux/CMakeLists.txt b/NativeApp/Linux/CMakeLists.txt
index a550fe0b..cf3214b8 100644
--- a/NativeApp/Linux/CMakeLists.txt
+++ b/NativeApp/Linux/CMakeLists.txt
@@ -18,10 +18,11 @@ target_include_directories(XCBKeySyms PUBLIC .)
 source_group("source" FILES ${SOURCE})
 source_group("interface" FILES ${INTERFACE})
 
+find_library(XCB_LIBRARY xcb)
 target_link_libraries(XCBKeySyms 
 PRIVATE 
     Diligent-BuildSettings
-    xcb
+    ${XCB_LIBRARY}
 )
 
 set_target_properties(XCBKeySyms PROPERTIES