fixes

Author: brycehutchings

.azure-pipelines/generate_windows_matrix_build.py

@@ -11,7 +11,7 @@
     configs = {}
     for  platform, debug, uwp in product(PLATFORMS, (False,), TRUE_FALSE):
         # No need to support ARM/ARM64 except for UWP.
-        if uwp and (platform.lower() == 'arm' or platform.lower() == 'arm64'):
+        if not uwp and (platform.lower() == 'arm' or platform.lower() == 'arm64'):
             continue
 
         label = [platform]

src/CMakeLists.txt

@@ -28,14 +28,16 @@ include(GNUInstallDirs)
 set(OpenGL_GL_PREFERENCE GLVND)
 if (NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
     # OpenGL package will be found for UWP apps but gl.h excludes UWP apps so it isn't actually usable.
-    find_package(OpenGL)
+find_package(OpenGL)
 endif()
 
 if(OPENGL_FOUND)
     add_definitions(-DXR_USE_GRAPHICS_API_OPENGL)
     message(STATUS "Enabling OpenGL support")
 elseif(BUILD_ALL_EXTENSIONS)
-    message(FATAL_ERROR "OpenGL not found")
+    if (NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+        message(FATAL_ERROR "OpenGL not found")
+    endif()
 endif()
 
 if(NOT CMAKE_VERSION VERSION_LESS 3.7.0)
@@ -116,6 +118,11 @@ endif()
 # Several files use these compile-time platform switches
 if(WIN32)
     add_definitions(-DXR_USE_PLATFORM_WIN32)
+    # TODO remove once work is done to get more stuff building for UWP.
+    if (CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+        set(BUILD_TESTS OFF)
+        set(BUILD_CONFORMANCE_TESTS OFF)
+    endif()
 elseif(PRESENTATION_BACKEND MATCHES "xlib")
     add_definitions(-DXR_USE_PLATFORM_XLIB)
 elseif(PRESENTATION_BACKEND MATCHES "xcb")

src/tests/hello_xr/CMakeLists.txt

@@ -69,11 +69,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
         target_compile_definitions(hello_xr PRIVATE _CRT_SECURE_NO_WARNINGS)
         target_compile_options(hello_xr PRIVATE /Zc:wchar_t /Zc:forScope /W4 /WX)
     endif()
-    target_link_libraries(hello_xr d3d11 d3d12 d3dcompiler dxgi ole32)
-
-    if(OPENGL_FOUND)
-        target_link_libraries(hello_xr ${OPENGL_gl_LIBRARY})
-    endif()    
+    target_link_libraries(hello_xr d3d11 d3d12 d3dcompiler dxgi ole32 ${OPENGL_gl_LIBRARY})
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
     target_compile_options(hello_xr PRIVATE -Wall)
     target_link_libraries(hello_xr m pthread)

src/tests/list/CMakeLists.txt

@@ -38,9 +38,6 @@ endif()
 if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
     target_compile_options(runtime_list PRIVATE /Zc:wchar_t /Zc:forScope /W4 /WX)
     target_link_libraries(runtime_list openxr_loader)
-    if(OPENGL_FOUND)
-        target_link_libraries(runtime_list ${OPENGL_gl_LIBRARY})
-    endif()
 endif()
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Linux")

src/tests/loader_test/CMakeLists.txt

@@ -45,12 +45,7 @@ endif()
 if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
     target_compile_definitions(loader_test PRIVATE _CRT_SECURE_NO_WARNINGS)
     target_compile_options(loader_test PRIVATE /Zc:wchar_t /Zc:forScope /W4 /WX)
-    target_link_libraries(loader_test openxr_loader d3d11)
-
-    if(OPENGL_FOUND)
-        target_link_libraries(loader_test ${OPENGL_gl_LIBRARY})
-    endif()
-
+    target_link_libraries(loader_test openxr_loader)
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
     target_compile_options(
         loader_test PRIVATE -Wall -Wno-unused-function -Wno-format-truncation