From ba3d49225c9ff3514fb87ae5d692baefe5edec30 Mon Sep 17 00:00:00 2001 From: blender Date: Tue, 17 Mar 2020 18:32:50 +0100 Subject: [PATCH] make deps: Fixes to make OpenXR to work on CentOS Linux - Harvest to a proper location. - Disable STD's filesystem which is experimental and caused linking errors when OpenXR is usedi n Blender. --- build_files/build_environment/cmake/harvest.cmake | 2 +- build_files/build_environment/cmake/xr_openxr.cmake | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build_files/build_environment/cmake/harvest.cmake b/build_files/build_environment/cmake/harvest.cmake index 6801ef284d0..4d27509890f 100644 --- a/build_files/build_environment/cmake/harvest.cmake +++ b/build_files/build_environment/cmake/harvest.cmake @@ -162,7 +162,7 @@ harvest(opensubdiv/lib opensubdiv/lib "*.a") harvest(openvdb/include/openvdb openvdb/include/openvdb "*.h") harvest(openvdb/lib openvdb/lib "*.a") harvest(xr_openxr_sdk/include/openxr xr_openxr_sdk/include/openxr "*.h") -harvest(xr_openxr_sdk/lib xr_openxr_sdk/src/loader "*.a") +harvest(xr_openxr_sdk/lib xr_openxr_sdk/lib "*.a") harvest(osl/bin osl/bin "oslc") harvest(osl/include osl/include "*.h") harvest(osl/lib osl/lib "*.a") diff --git a/build_files/build_environment/cmake/xr_openxr.cmake b/build_files/build_environment/cmake/xr_openxr.cmake index b0751e418b9..3eb613e3a42 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 + -DCMAKE_CXX_FLAGS=-DDISABLE_STD_FILESYSTEM=1 ) endif()