fixes

Author: brycehutchings

.azure-pipelines/generate_windows_matrix_build.py

@@ -10,6 +10,10 @@
 
     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'):
+            continue
+
         label = [platform]
         config = []
         generator = VS_VERSION

src/CMakeLists.txt

@@ -26,7 +26,11 @@ include(GNUInstallDirs)
 
 ### Dependencies
 set(OpenGL_GL_PREFERENCE GLVND)
-find_package(OpenGL)
+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)
+endif()
+
 if(OPENGL_FOUND)
     add_definitions(-DXR_USE_GRAPHICS_API_OPENGL)
     message(STATUS "Enabling OpenGL support")
@@ -84,9 +88,13 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
     add_definitions(-DXR_OS_LINUX)
 endif()
 
+# /EHsc (support for C++ exceptions) is default in most configurations but seems missing when building arm/arm64.
+IF(MSVC)
+    SET(CMAKE_CXX_FLAGS "/EHsc")
+ENDIF(MSVC)
+
 # This is a little helper library for setting up OpenGL
-if(OPENGL_FOUND AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/common/gfxwrapper_opengl.c"
-   AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+if(OPENGL_FOUND AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/common/gfxwrapper_opengl.c")
     add_library(openxr-gfxwrapper STATIC common/gfxwrapper_opengl.c common/gfxwrapper_opengl.h)
     target_include_directories(openxr-gfxwrapper PUBLIC ${PROJECT_SOURCE_DIR}/external/include)
     if(TARGET OpenGL::OpenGL)

src/tests/hello_xr/CMakeLists.txt

@@ -69,7 +69,11 @@ 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 ${OPENGL_gl_LIBRARY})
+    target_link_libraries(hello_xr d3d11 d3d12 d3dcompiler dxgi ole32)
+
+    if(OPENGL_FOUND)
+        target_link_libraries(hello_xr ${OPENGL_gl_LIBRARY})
+    endif()    
 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

@@ -37,7 +37,10 @@ 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 opengl32)
+    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,7 +45,12 @@ 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 opengl32 d3d11)
+    target_link_libraries(loader_test openxr_loader d3d11)
+
+    if(OPENGL_FOUND)
+        target_link_libraries(loader_test ${OPENGL_gl_LIBRARY})
+    endif()
+
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
     target_compile_options(
         loader_test PRIVATE -Wall -Wno-unused-function -Wno-format-truncation