[Bf-blender-cvs] [82fc81816ed] master: Fix openXR building with install_deps in some compilers.

Bastien Montagne noreply at git.blender.org
Wed Mar 18 15:11:19 CET 2020


Commit: 82fc81816ed4eee358fe9bcf58638b72ebf83a32
Author: Bastien Montagne
Date:   Wed Mar 18 15:10:31 2020 +0100
Branches: master
https://developer.blender.org/rB82fc81816ed4eee358fe9bcf58638b72ebf83a32

Fix openXR building with install_deps in some compilers.

===================================================================

M	build_files/build_environment/install_deps.sh

===================================================================

diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh
index d4fddc89f82..483a729fca3 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=0
+  xr_openxr_magic=1
   _init_xr_openxr_sdk
 
   # Clean install if needed!
@@ -3186,7 +3186,7 @@ compile_XR_OpenXR_SDK() {
     cmake_d="$cmake_d -D BUILD_WITH_XCB_HEADERS=OFF"
     cmake_d="$cmake_d -D BUILD_WITH_XLIB_HEADERS=ON"
 
-    cmake $cmake_d ..
+    cmake $cmake_d "-DCMAKE_CXX_FLAGS=-DDISABLE_STD_FILESYSTEM=1" ..
 
     make -j$THREADS && make install
     make clean



More information about the Bf-blender-cvs mailing list