[Bf-blender-cvs] [de2d03ace9c] vr_scene_inspection: Merge branch 'master' into temp-openxr-buildstuff
Julian Eisel
noreply at git.blender.org
Mon Feb 17 12:34:44 CET 2020
Commit: de2d03ace9c4189c88a539fc3c271f8b3a75465a
Author: Julian Eisel
Date: Mon Feb 17 11:01:47 2020 +0100
Branches: vr_scene_inspection
https://developer.blender.org/rBde2d03ace9c4189c88a539fc3c271f8b3a75465a
Merge branch 'master' into temp-openxr-buildstuff
===================================================================
===================================================================
diff --cc build_files/build_environment/CMakeLists.txt
index 0a9378b4c0e,34ad0599ce2..1ff726613c0
--- a/build_files/build_environment/CMakeLists.txt
+++ b/build_files/build_environment/CMakeLists.txt
@@@ -98,7 -98,7 +98,8 @@@ else(
include(cmake/pugixml.cmake)
endif()
include(cmake/openimagedenoise.cmake)
+ include(cmake/embree.cmake)
+include(cmake/openxr.cmake)
if(WITH_WEBP)
include(cmake/webp.cmake)
diff --cc build_files/build_environment/install_deps.sh
index e55e81a2760,6294ab8bdd3..e4d5d1353b3
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@@ -52,16 -52,16 +52,19 @@@ getopt
-o s:i:t:h \
--long source:,install:,tmp:,info:,threads:,help,show-deps,no-sudo,no-build,no-confirm,\
with-all,with-opencollada,with-jack,with-embree,with-oidn,\
-ver-ocio:,ver-oiio:,ver-llvm:,ver-osl:,ver-osd:,ver-openvdb:,\
+ver-ocio:,ver-oiio:,ver-llvm:,ver-osl:,ver-osd:,ver-openvdb:,ver-openxr:,\
force-all,force-python,force-numpy,force-boost,\
force-ocio,force-openexr,force-oiio,force-llvm,force-osl,force-osd,force-openvdb,\
- force-ffmpeg,force-opencollada,force-alembic,force-embree,force-oidn,force-openxr,\
+ force-ffmpeg,force-opencollada,force-alembic,force-embree,force-oidn,force-usd,\
++force-openxr,\
build-all,build-python,build-numpy,build-boost,\
build-ocio,build-openexr,build-oiio,build-llvm,build-osl,build-osd,build-openvdb,\
- build-ffmpeg,build-opencollada,build-alembic,build-embree,build-oidn,build-openxr,\
+ build-ffmpeg,build-opencollada,build-alembic,build-embree,build-oidn,build-usd,\
++build-openxr,\
skip-python,skip-numpy,skip-boost,\
skip-ocio,skip-openexr,skip-oiio,skip-llvm,skip-osl,skip-osd,skip-openvdb,\
- skip-ffmpeg,skip-opencollada,skip-alembic,skip-embree,skip-oidn,skip-openxr \
-skip-ffmpeg,skip-opencollada,skip-alembic,skip-embree,skip-oidn,skip-usd \
++skip-ffmpeg,skip-opencollada,skip-alembic,skip-embree,skip-oidn,skip-usd, \
++skip-openxr\
-- "$@" \
)
@@@ -224,9 -221,9 +227,12 @@@ ARGUMENTS_INFO="\"COMMAND LINE ARGUMENT
--build-ffmpeg
Force the build of FFMpeg.
+ --build-usd
+ Force the build of Universal Scene Description.
+
+ --build-openxr
+ Force the build of OpenXR-SDK.
+
Note about the --build-foo options:
* They force the script to prefer building dependencies rather than using available packages.
This may make things simpler and allow working around some distribution bugs, but on the other hand it will
@@@ -285,9 -282,9 +291,12 @@@
--force-ffmpeg
Force the rebuild of FFMpeg.
+ --force-usd
+ Force the rebuild of Universal Scene Description.
+
+ --force-openxr
+ Force the rebuild of OpenXR-SDK.
+
Note about the --force-foo options:
* They obviously only have an effect if those libraries are built by this script
(i.e. if there is no available and satisfactory package)!
@@@ -339,9 -336,9 +348,12 @@@
--skip-ffmpeg
Unconditionally skip FFMpeg installation/building.
+ --skip-usd
+ Unconditionally skip Universal Scene Description installation/building.\""
+
+ --skip-openxr
+ Unconditionally skip OpenXR-SDK installation/building.\""
+
# ----------------------------------------------------------------------------
# Main Vars
@@@ -650,7 -642,7 +667,8 @@@ while true; d
OIDN_FORCE_BUILD=true
FFMPEG_FORCE_BUILD=true
ALEMBIC_FORCE_BUILD=true
+ USD_FORCE_BUILD=true
+ OPENXR_FORCE_BUILD=true
shift; continue
;;
--build-python)
@@@ -702,9 -694,9 +720,12 @@@
--build-alembic)
ALEMBIC_FORCE_BUILD=true; shift; continue
;;
+ --build-usd)
+ USD_FORCE_BUILD=true; shift; continue
+ ;;
+ --build-openxr)
+ OPENXR_FORCE_BUILD=true; shift; continue
+ ;;
--force-all)
PYTHON_FORCE_REBUILD=true
NUMPY_FORCE_REBUILD=true
@@@ -721,7 -713,7 +742,8 @@@
OIDN_FORCE_REBUILD=true
FFMPEG_FORCE_REBUILD=true
ALEMBIC_FORCE_REBUILD=true
+ USD_FORCE_REBUILD=true
+ OPENXR_FORCE_REBUILD=true
shift; continue
;;
--force-python)
@@@ -771,9 -763,9 +793,12 @@@
--force-alembic)
ALEMBIC_FORCE_REBUILD=true; shift; continue
;;
+ --force-usd)
+ USD_FORCE_REBUILD=true; shift; continue
+ ;;
+ --force-openxr)
+ OPENXR_FORCE_REBUILD=true; shift; continue
+ ;;
--skip-python)
PYTHON_SKIP=true; shift; continue
;;
@@@ -819,9 -811,9 +844,12 @@@
--skip-alembic)
ALEMBIC_SKIP=true; shift; continue
;;
+ --skip-usd)
+ USD_SKIP=true; shift; continue
+ ;;
+ --skip-openxr)
+ OPENXR_SKIP=true; shift; continue
+ ;;
--)
# no more arguments to parse
break
diff --cc build_files/cmake/platform/platform_unix.cmake
index 8eb0bb1d89d,91f836d5265..5f0a843e5be
--- a/build_files/cmake/platform/platform_unix.cmake
+++ b/build_files/cmake/platform/platform_unix.cmake
@@@ -448,26 -448,6 +448,14 @@@ if(WITH_TBB
find_package_wrapper(TBB)
endif()
- if(NOT WITH_TBB OR NOT TBB_FOUND)
- if(WITH_OPENIMAGEDENOISE)
- message(STATUS "TBB not found, disabling OpenImageDenoise")
- set(WITH_OPENIMAGEDENOISE OFF)
- endif()
- if(WITH_OPENVDB)
- message(STATUS "TBB not found, disabling OpenVDB")
- set(WITH_OPENVDB OFF)
- endif()
- endif()
-
+if(WITH_OPENXR)
+ find_package(OpenXR-SDK)
+ if(NOT OPENXR_SDK_FOUND)
+ message(WARNING "OpenXR-SDK not found, disabling WITH_OPENXR")
+ set(WITH_OPENXR OFF)
+ endif()
+endif()
+
-
# OpenSuse needs lutil, ArchLinux not, for now keep, can avoid by using --as-needed
if(HAIKU)
list(APPEND PLATFORM_LINKLIBS -lnetwork)
More information about the Bf-blender-cvs
mailing list