Merge branch 'master' into py-undo

SCIInstitute · Aug 9, 2023 · 2ec166e · 2ec166e
2 parents 77b33a7 + 96fc0de
commit 2ec166e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/Superbuild/OsprayExternal.cmake b/Superbuild/OsprayExternal.cmake
@@ -25,7 +25,7 @@
 #  DEALINGS IN THE SOFTWARE.
 
 SET_PROPERTY(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
-SET(ospray_GIT_TAG "origin/scirun-build-2.4")
+SET(ospray_GIT_TAG "origin/scirun-build-2.10")
 
 set(ospray_DEPENDENCIES)
 LIST(APPEND ospray_DEPENDENCIES GLM_external)
@@ -45,6 +45,7 @@ ExternalProject_Add(Ospray_external
     -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
     -DENABLE_OSPRAY_SUPERBUILD:BOOL=ON
     -Dglm_DIR:PATH=${GLM_DIR}/cmake/glm
+    -DBUILD_ISA_AVX512:BOOL=OFF
 )
 
 ExternalProject_Get_Property(Ospray_external BINARY_DIR)

diff --git a/src/Core/Thread/Mutex.h b/src/Core/Thread/Mutex.h
@@ -32,6 +32,7 @@
 #include <boost/noncopyable.hpp>
 #include <thread>
 #include <mutex>
+#include <string>
 #include <Core/Thread/share.h>
 
 namespace SCIRun