Commit: 9e8afa8817ed8281cefd6e21720943575a2f3284
Author: Julian Eisel
Date: Sat Mar 21 21:56:56 2020 +0100
Branches: master
https://developer.blender.org/rB9e8afa8817ed8281cefd6e21720943575a2f3284
Fix OpenXR SDK failing to compile with no JsonCpp installed
Force the SDK to use its own, bundled JsonCpp sources.
===================================================================
M build_files/build_environment/cmake/xr_openxr.cmake
M build_files/build_environment/install_deps.sh
===================================================================
diff --git a/build_files/build_environment/cmake/xr_openxr.cmake
b/build_files/build_environment/cmake/xr_openxr.cmake
index 3eb613e3a42..16da266c3d2 100644
--- a/build_files/build_environment/cmake/xr_openxr.cmake
+++ b/build_files/build_environment/cmake/xr_openxr.cmake
@@ -29,6 +29,7 @@ if(UNIX AND NOT APPLE)
-DBUILD_WITH_WAYLAND_HEADERS=OFF
-DBUILD_WITH_XCB_HEADERS=OFF
-DBUILD_WITH_XLIB_HEADERS=ON
+ -DBUILD_WITH_SYSTEM_JSONCPP=OFF
-DCMAKE_CXX_FLAGS=-DDISABLE_STD_FILESYSTEM=1
)
endif()
diff --git a/build_files/build_environment/install_deps.sh
b/build_files/build_environment/install_deps.sh
index 305396ed27f..bd6da85de44 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -3128,7 +3128,7 @@ compile_XR_OpenXR_SDK() {
fi
# To be changed each time we make edits that would modify the compiled
result!
- xr_openxr_magic=1
+ xr_openxr_magic=2
_init_xr_openxr_sdk
# Clean install if needed!
@@ -3185,6 +3185,7 @@ compile_XR_OpenXR_SDK() {
cmake_d="$cmake_d -D BUILD_WITH_WAYLAND_HEADERS=OFF"
cmake_d="$cmake_d -D BUILD_WITH_XCB_HEADERS=OFF"
cmake_d="$cmake_d -D BUILD_WITH_XLIB_HEADERS=ON"
+ cmake_d="$cmake_d -D BUILD_WITH_SYSTEM_JSONCPP=OFF"
cmake $cmake_d "-DCMAKE_CXX_FLAGS=-DDISABLE_STD_FILESYSTEM=1" ..
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
