diff --git a/Superbuild/Superbuild.cmake b/Superbuild/Superbuild.cmake index 33300e30ee..609a124e7e 100644 --- a/Superbuild/Superbuild.cmake +++ b/Superbuild/Superbuild.cmake @@ -103,7 +103,15 @@ OPTION(WITH_TETGEN "Build Tetgen." ON) ########################################### # Configure ospray -OPTION(WITH_OSPRAY "Build Ospray." OFF) +OPTION(BUILD_OSPRAY "Build Ospray." OFF) + +########################################### +# Use local ospray +OPTION(PREBUILT_OSPRAY "Use prebuilt copy of Ospray." OFF) + +IF (BUILD_OSPRAY AND PREBUILT_OSPRAY) + MESSAGE(SEND_ERROR "Cannot set both building and prebuilt Ospray.") +ENDIF() ########################################### # Configure data @@ -240,12 +248,15 @@ IF(WITH_TETGEN) ADD_EXTERNAL( ${SUPERBUILD_DIR}/TetgenExternal.cmake Tetgen_external ) ENDIF() -IF(WITH_OSPRAY) +IF(PREBUILT_OSPRAY) + find_package(ospray 2.10.0 REQUIRED) +ELSEIF(BUILD_OSPRAY) #INCLUDE(${SUPERBUILD_DIR}/TBBExternal.cmake) #INCLUDE(${SUPERBUILD_DIR}/RKCommonExternal.cmake) #INCLUDE(${SUPERBUILD_DIR}/EmbreeExternal.cmake) ADD_EXTERNAL(${SUPERBUILD_DIR}/OsprayExternal.cmake Ospray_external) ENDIF() +SET(WITH_OSPRAY (BUILD_OSPRAY || PREBUILT_OSPRAY)) IF(NOT BUILD_HEADLESS) ADD_EXTERNAL( ${SUPERBUILD_DIR}/QwtExternal.cmake Qwt_external ) diff --git a/docs/start/build.md b/docs/start/build.md index bf66566261..4bb9871743 100644 --- a/docs/start/build.md +++ b/docs/start/build.md @@ -153,5 +153,9 @@ make ``` Append `-jN`, where N is the number of threads, to build multi-threaded. +### Configuring SCIRun with Prebuilt OSPRay + +To use the OsprayViewer module with a prebuilt binary, you need to download from the [releases page](https://github.com/ospray/OSPRay/releases) and extract the zip. Only OSPRay 2.4 and 2.10 have been tested. Then add the directory to your shell's PATH variable. CMake will automatically find it when the flag `PREBUILT_OSPRAY` is enabled. + ## Tagging Releases On an OSX system, run script `release.sh` in the `src` directory with the release name in format ***beta.XX*** as a parameter.