From 2bee0ad2a6b24ed2f7834098a8a3566cfbc7541e Mon Sep 17 00:00:00 2001 From: Dan White Date: Mon, 12 Nov 2018 21:16:53 -0700 Subject: [PATCH] Try ospray as submodule --- .gitmodules | 3 +++ src/Externals/submodules/CMakeLists.txt | 12 ++++++++++++ src/Externals/submodules/ospray | 1 + 3 files changed, 16 insertions(+) create mode 160000 src/Externals/submodules/ospray diff --git a/.gitmodules b/.gitmodules index e924cfa56d..dd4ab92920 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "src/Externals/submodules/googletest"] path = src/Externals/submodules/googletest url = https://github.com/CIBC-Internal/googletest.git +[submodule "src/Externals/submodules/ospray"] + path = src/Externals/submodules/ospray + url = https://github.com/CIBC-Internal/ospray.git diff --git a/src/Externals/submodules/CMakeLists.txt b/src/Externals/submodules/CMakeLists.txt index ea91f88a29..5cee1c3297 100644 --- a/src/Externals/submodules/CMakeLists.txt +++ b/src/Externals/submodules/CMakeLists.txt @@ -62,3 +62,15 @@ endif() #ENDIF() ADD_SUBDIRECTORY(googletest) + +IF(WITH_OSPRAY) + set(embree_DIR ${Embree_DIR}) + set(OSPRAY_TASKING_SYSTEM "TBB") + set(TBB_ROOT ${Tbb_DIR}) + set(OSPRAY_ENABLE_TESTING OFF) + set(OSPRAY_SG_CHOMBO OFF) + set(OSPRAY_SG_OPENIMAGEIO OFF) + set(OSPRAY_SG_VTK OFF) + set(ISPC_EXECUTABLE ${Ispc_DIR}/ispc) + ADD_SUBDIRECTORY(ospray) +ENDIF() diff --git a/src/Externals/submodules/ospray b/src/Externals/submodules/ospray new file mode 160000 index 0000000000..48f12526e7 --- /dev/null +++ b/src/Externals/submodules/ospray @@ -0,0 +1 @@ +Subproject commit 48f12526e7c4256a61be30ef00ee3a977ce644e9