build: Build loader, api-layers with all available platforms

Signed-off-by: Ryan Pavlik <[email protected]>

Author: rpavlik

src/CMakeLists.txt

@@ -109,6 +109,19 @@ elseif( PRESENTATION_BACKEND MATCHES "wayland" )
     set(BUILD_CONFORMANCE_TESTS OFF)
 endif()
 
+add_library(openxr-all-supported INTERFACE)
+if(BUILD_WITH_XLIB_HEADERS)
+    target_compile_definitions(openxr-all-supported INTERFACE XR_USE_PLATFORM_XLIB)
+endif()
+
+if(BUILD_WITH_XCB_HEADERS)
+    target_compile_definitions(openxr-all-supported INTERFACE XR_USE_PLATFORM_XCB)
+endif()
+
+if(BUILD_WITH_WAYLAND_HEADERS)
+    target_compile_definitions(openxr-all-supported INTERFACE XR_USE_PLATFORM_WAYLAND)
+endif()
+
 # Find glslc shader compiler.
 # On Android, the NDK includes the binary, so no external dependency.
 if(ANDROID)

src/api_layers/CMakeLists.txt

@@ -66,6 +66,7 @@ add_library(XrApiLayer_api_dump SHARED
 )
 set_target_properties(XrApiLayer_api_dump PROPERTIES FOLDER ${API_LAYERS_FOLDER})
 
+target_link_libraries(XrApiLayer_api_dump PRIVATE openxr-all-supported)
 add_dependencies(XrApiLayer_api_dump
     generate_openxr_header
     xr_global_generated_files
@@ -128,6 +129,7 @@ add_library(XrApiLayer_core_validation SHARED
 )
 set_target_properties(XrApiLayer_core_validation PROPERTIES FOLDER ${API_LAYERS_FOLDER})
 
+target_link_libraries(XrApiLayer_core_validation PRIVATE openxr-all-supported)
 add_dependencies(XrApiLayer_core_validation
     generate_openxr_header
     xr_global_generated_files

src/cmake/presentation.cmake

@@ -22,8 +22,29 @@ if(PKG_CONFIG_FOUND)
     pkg_search_module(WAYLAND_CLIENT wayland-client)
 endif()
 
+include(CMakeDependentOption)
+cmake_dependent_option(
+    BUILD_WITH_XLIB_HEADERS "Build with support for X11/Xlib-related features." ON "X11_FOUND" OFF
+)
+cmake_dependent_option(
+    BUILD_WITH_XCB_HEADERS "Build with support for XCB-related features." ON "X11_FOUND AND XCB_FOUND" OFF
+)
+cmake_dependent_option(
+    BUILD_WITH_WAYLAND_HEADERS "Build with support for Wayland-related features." ON "WAYLAND_CLIENT_FOUND"
+    OFF
+)
+
+message(STATUS "BUILD_WITH_XLIB_HEADERS: ${BUILD_WITH_XLIB_HEADERS}")
+message(STATUS "BUILD_WITH_XCB_HEADERS: ${BUILD_WITH_XCB_HEADERS}")
+message(STATUS "BUILD_WITH_WAYLAND_HEADERS: ${BUILD_WITH_WAYLAND_HEADERS}")
 
 if(PRESENTATION_BACKEND MATCHES "xlib")
+    if(NOT BUILD_WITH_XLIB_HEADERS)
+        message(
+            FATAL_ERROR
+                "xlib backend selected, but BUILD_WITH_XLIB_HEADERS either disabled or unavailable due to missing dependencies."
+        )
+    endif()
     if(BUILD_TESTS AND (NOT X11_Xxf86vm_LIB OR NOT X11_Xrandr_LIB))
         message(FATAL_ERROR "OpenXR tests using xlib backend requires Xxf86vm and Xrandr")
     endif()
@@ -41,6 +62,12 @@ if(PRESENTATION_BACKEND MATCHES "xlib")
         endif()
     endif()
 elseif(PRESENTATION_BACKEND MATCHES "xcb")
+    if(NOT BUILD_WITH_XCB_HEADERS)
+        message(
+            FATAL_ERROR
+                "xcb backend selected, but BUILD_WITH_XCB_HEADERS either disabled or unavailable due to missing dependencies."
+        )
+    endif()
     pkg_search_module(XCB_RANDR REQUIRED xcb-randr)
     pkg_search_module(XCB_KEYSYMS REQUIRED xcb-keysyms)
     pkg_search_module(XCB_GLX REQUIRED xcb-glx)
@@ -56,6 +83,12 @@ elseif(PRESENTATION_BACKEND MATCHES "xcb")
         target_link_libraries(openxr-gfxwrapper PRIVATE ${X11_X11_LIB} ${XCB_KEYSYMS_LIBRARIES} ${XCB_RANDR_LIBRARIES})
     endif()
 elseif(PRESENTATION_BACKEND MATCHES "wayland")
+    if(NOT BUILD_WITH_WAYLAND_HEADERS)
+        message(
+            FATAL_ERROR
+                "wayland backend selected, but BUILD_WITH_WAYLAND_HEADERS either disabled or unavailable due to missing dependencies."
+        )
+    endif()
 
     pkg_search_module(WAYLAND_EGL REQUIRED wayland-egl)
     pkg_search_module(WAYLAND_SCANNER REQUIRED wayland-scanner)

src/loader/CMakeLists.txt

@@ -131,6 +131,7 @@ if(NOT BUILD_LOADER_WITH_EXCEPTION_HANDLING)
         PRIVATE XRLOADER_DISABLE_EXCEPTION_HANDLING
     )
 endif()
+target_link_libraries(openxr_loader PRIVATE openxr-all-supported)
 
 target_compile_definitions(openxr_loader
     PRIVATE API_NAME="OpenXR"