Title: [271138] trunk
- Revision
- 271138
- Author
- [email protected]
- Date
- 2021-01-04 14:54:49 -0800 (Mon, 04 Jan 2021)
Log Message
[WebXR][WPE] Build fails without openxr installed
https://bugs.webkit.org/show_bug.cgi?id=220250
Reviewed by Carlos Alberto Lopez Perez.
.:
* Source/cmake/FindOpenXR.cmake: Fix some names and export
OPENXR_FOUND var.
* Source/cmake/OptionsWPE.cmake: Fail config is WebXR is enabled but
couldn't find OpenXR.
Tools:
* jhbuild/jhbuild-minimal.modules: Add openxr to wpe's minimal
moduleset.
Modified Paths
Diff
Modified: trunk/ChangeLog (271137 => 271138)
--- trunk/ChangeLog 2021-01-04 20:01:40 UTC (rev 271137)
+++ trunk/ChangeLog 2021-01-04 22:54:49 UTC (rev 271138)
@@ -1,3 +1,15 @@
+2021-01-04 Lauro Moura <[email protected]>
+
+ [WebXR][WPE] Build fails without openxr installed
+ https://bugs.webkit.org/show_bug.cgi?id=220250
+
+ Reviewed by Carlos Alberto Lopez Perez.
+
+ * Source/cmake/FindOpenXR.cmake: Fix some names and export
+ OPENXR_FOUND var.
+ * Source/cmake/OptionsWPE.cmake: Fail config is WebXR is enabled but
+ couldn't find OpenXR.
+
2021-01-04 Jeff Miller <[email protected]>
Update user-visible copyright strings to include 2021
Modified: trunk/Source/cmake/FindOpenXR.cmake (271137 => 271138)
--- trunk/Source/cmake/FindOpenXR.cmake 2021-01-04 20:01:40 UTC (rev 271137)
+++ trunk/Source/cmake/FindOpenXR.cmake 2021-01-04 22:54:49 UTC (rev 271138)
@@ -1,9 +1,9 @@
# - Try to find OpenXR.
# Once done, this will define
#
-# OPENXR_FOUND - system has WPE.
-# OPENXR_INCLUDE_DIRS - the WPE include directories
-# OPENXR_LIBRARIES - link these to use WPE.
+# OPENXR_FOUND - system has OpenXR.
+# OPENXR_INCLUDE_DIRS - the OpenXR include directories
+# OPENXR_LIBRARIES - link these to use OpenXR.
#
# Copyright (C) 2019 Igalia S.L.
#
@@ -44,4 +44,4 @@
mark_as_advanced(OPENXR_INCLUDE_DIRS OPENXR_LIBRARIES)
include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(OpenXR REQUIRED_VARS OPENXR_INCLUDE_DIRS OPENXR_LIBRARIES)
+find_package_handle_standard_args(OpenXR FOUND_VAR OPENXR_FOUND REQUIRED_VARS OPENXR_INCLUDE_DIRS OPENXR_LIBRARIES)
Modified: trunk/Source/cmake/OptionsWPE.cmake (271137 => 271138)
--- trunk/Source/cmake/OptionsWPE.cmake 2021-01-04 20:01:40 UTC (rev 271137)
+++ trunk/Source/cmake/OptionsWPE.cmake 2021-01-04 22:54:49 UTC (rev 271138)
@@ -184,6 +184,9 @@
if (ENABLE_WEBXR)
find_package(OpenXR 1.0.9)
+ if (NOT OPENXR_FOUND)
+ message(FATAL_ERROR "OpenXR is required to enable WebXR support.")
+ endif ()
SET_AND_EXPOSE_TO_BUILD(USE_OPENXR ${OpenXR_FOUND})
endif ()
Modified: trunk/Tools/ChangeLog (271137 => 271138)
--- trunk/Tools/ChangeLog 2021-01-04 20:01:40 UTC (rev 271137)
+++ trunk/Tools/ChangeLog 2021-01-04 22:54:49 UTC (rev 271138)
@@ -1,3 +1,13 @@
+2021-01-04 Lauro Moura <[email protected]>
+
+ [WebXR][WPE] Build fails without openxr installed
+ https://bugs.webkit.org/show_bug.cgi?id=220250
+
+ Reviewed by Carlos Alberto Lopez Perez.
+
+ * jhbuild/jhbuild-minimal.modules: Add openxr to wpe's minimal
+ moduleset.
+
2020-12-28 Alexey Proskuryakov <[email protected]>
built-product-archive should work with Python 3
Modified: trunk/Tools/jhbuild/jhbuild-minimal.modules (271137 => 271138)
--- trunk/Tools/jhbuild/jhbuild-minimal.modules 2021-01-04 20:01:40 UTC (rev 271137)
+++ trunk/Tools/jhbuild/jhbuild-minimal.modules 2021-01-04 22:54:49 UTC (rev 271138)
@@ -15,6 +15,7 @@
<dependencies>
<dep package="wpebackend-fdo"/>
<dep package="libsoup"/>
+ <dep package="openxr"/>
</dependencies>
</metamodule>
@@ -120,4 +121,13 @@
hash="sha256:f68f56d60c80a77df8fc08fa1016bc5831605d4717b622c96212573271e14ecc"/>
</distutils>
+ <!-- OpenXR required for WebXR support -->
+ <cmake id="openxr">
+ <pkg-config>openxr.pc</pkg-config>
+ <branch module="KhronosGroup/OpenXR-SDK/archive/release-${version}.tar.gz" version="1.0.11"
+ checkoutdir="openxr-${version}"
+ repo="github-tarball"
+ hash="sha256:8f28f0f7707487435578264ac18e14af17a5eab2062fc925fe01cd96ed802dce"/>
+ </cmake>
+
</moduleset>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
