CMake: improved handling of X11 and XCB (close #212)

TheMostDiligent · TheMostDiligent · commit 0e847016ce55 · 2024-02-05T12:36:07.000-08:00
diff --git 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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -463,18 +463,20 @@ elseif(PLATFORM_ANDROID)`
`463`	`463`	`include/Android`
`464`	`464`	`)`
`465`	`465`	`elseif(PLATFORM_LINUX)`
	`466`	`+ find_package(X11 REQUIRED)`
`466`	`467`	`target_link_libraries(Diligent-NativeAppBase`
`467`	`468`	`PRIVATE`
`468`		`- X11`
	`469`	`+ X11::X11`
`469`	`470`	`)`
`470`	`471`	`target_include_directories(Diligent-NativeAppBase`
`471`	`472`	`PUBLIC`
`472`	`473`	`include/Linux`
`473`	`474`	`)`
`474`	`475`	`if(VULKAN_SUPPORTED)`
	`476`	`+ find_library(XCB_LIBRARY xcb)`
`475`	`477`	`target_link_libraries(Diligent-NativeAppBase`
`476`	`478`	`PRIVATE`
`477`		`- xcb`
	`479`	`+ ${XCB_LIBRARY}`
`478`	`480`	`)`
`479`	`481`	`endif()`
`480`	`482`	`elseif(PLATFORM_MACOS)`