CMake: improved handling of X11 and XCB

Author: TheMostDiligent

SampleBase/CMakeLists.txt

@@ -189,7 +189,8 @@ if(PLATFORM_UNIVERSAL_WINDOWS)
 elseif(PLATFORM_ANDROID)
     target_link_libraries(Diligent-SampleBase PRIVATE GLESv3 PUBLIC native_app_glue)
 elseif(PLATFORM_LINUX)
-    target_link_libraries(Diligent-SampleBase PRIVATE XCBKeySyms GL X11)
+    find_package(X11 REQUIRED)
+    target_link_libraries(Diligent-SampleBase PRIVATE XCBKeySyms ${OPENGL_LIBRARY} X11::X11)
 elseif(PLATFORM_MACOS OR PLATFORM_IOS)
 
 endif()

Tutorials/Tutorial00_HelloLinux/CMakeLists.txt

@@ -24,9 +24,11 @@ set_target_properties(Tutorial00_HelloLinux PROPERTIES
 target_link_libraries(Tutorial00_HelloLinux PRIVATE Diligent-BuildSettings)
 
 if(GL_SUPPORTED)
-    target_link_libraries(Tutorial00_HelloLinux PRIVATE Diligent-GraphicsEngineOpenGL-shared GL X11)
+    find_package(X11 REQUIRED)
+    target_link_libraries(Tutorial00_HelloLinux PRIVATE Diligent-GraphicsEngineOpenGL-shared ${OPENGL_LIBRARY} X11::X11)
 endif()
 
 if(VULKAN_SUPPORTED)
-    target_link_libraries(Tutorial00_HelloLinux PRIVATE Diligent-GraphicsEngineVk-shared xcb)
+    find_library(XCB_LIBRARY xcb)
+    target_link_libraries(Tutorial00_HelloLinux PRIVATE Diligent-GraphicsEngineVk-shared ${XCB_LIBRARY})
 endif()