diff options
| author | Julian Eisel <julian@blender.org> | 2020-03-21 23:56:56 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-03-21 23:58:17 +0300 |
| commit | 9e8afa8817ed8281cefd6e21720943575a2f3284 (patch) | |
| tree | 24d35c1de18c1774b7fef42011db9372920d93a9 /build_files | |
| parent | 1e8dfe79c6b2ec293146d93be44c8078762860f2 (diff) | |
Fix OpenXR SDK failing to compile with no JsonCpp installed
Force the SDK to use its own, bundled JsonCpp sources.
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/build_environment/cmake/xr_openxr.cmake | 1 | ||||
| -rwxr-xr-x | build_files/build_environment/install_deps.sh | 3 |
2 files changed, 3 insertions, 1 deletions
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" .. |