Fix Windows release

Author: johguenther

cmake/compiler/dpcpp.cmake

@@ -102,8 +102,3 @@ string(REPLACE ";" " " OSPRAY_OCL_OPTIONS_STR "${OSPRAY_OCL_OPTIONS}")
 
 set(OSPRAY_OCL_OTHER_OPTIONS_STR "${OSPRAY_OCL_OTHER_OPTIONS}")
 string(REPLACE ";" " " OSPRAY_OCL_OTHER_OPTIONS_STR "${OSPRAY_OCL_OTHER_OPTIONS}")
-
-if (WIN32)
-  # workaround for https://gitlab.kitware.com/cmake/cmake/-/issues/18311
-  set(CMAKE_NINJA_CMCLDEPS_RC OFF)
-endif()

cmake/compiler/msvc.cmake

@@ -42,5 +42,16 @@ else()
     string(APPEND CMAKE_SHARED_LINKER_FLAGS_DEBUG " /nodefaultlib:libmmdd.lib")
     string(APPEND CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO " /nodefaultlib:libmmd.lib")
     string(APPEND CMAKE_SHARED_LINKER_FLAGS_RELEASE " /nodefaultlib:libmmd.lib")
+  elseif (OSPRAY_COMPILER_DPCPP)
+    foreach(FLAG
+      CMAKE_CXX_FLAGS_DEBUG
+      CMAKE_CXX_FLAGS_RELEASE
+      CMAKE_CXX_FLAGS_RELWITHDEBINFO
+      CMAKE_C_FLAGS_DEBUG
+      CMAKE_C_FLAGS_RELEASE
+      CMAKE_C_FLAGS_RELWITHDEBINFO
+    )
+      string(APPEND ${FLAG} " /Qimf-use-svml:false")
+    endforeach()
   endif()
 endif()

cmake/ospray_macros.cmake

@@ -341,7 +341,13 @@ macro(ospray_configure_compiler)
 
   if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "IntelLLVM" OR OSPRAY_MODULE_GPU)
     set(OSPRAY_COMPILER_DPCPP TRUE)
-    include(dpcpp)
+    if(WIN32) # icx on Windows behaves like msvc
+      # workaround for https://gitlab.kitware.com/cmake/cmake/-/issues/18311
+      set(CMAKE_NINJA_CMCLDEPS_RC OFF)
+      include(msvc)
+    else()
+      include(dpcpp)
+    endif()
   elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
     set(OSPRAY_COMPILER_ICC TRUE)
     if(WIN32) # icc on Windows behaves like msvc

scripts/release/win.ps1

@@ -16,7 +16,8 @@ cmake -L `
   -D BUILD_DEPENDENCIES_ONLY=ON `
   -D CMAKE_INSTALL_PREFIX=$DEP_DIR `
   -D CMAKE_INSTALL_LIBDIR=lib `
-  -D BUILD_EMBREE_FROM_SOURCE=OFF `
+  -D BUILD_EMBREE_FROM_SOURCE=ON `
+  -D BUILD_ISA_AVX512=OFF `
   -D BUILD_OIDN=ON `
   -D BUILD_OIDN_FROM_SOURCE=OFF `
   -D BUILD_OSPRAY_MODULE_MPI=ON `
@@ -32,6 +33,9 @@ cd $ROOT_DIR
 md build_release
 cd build_release
 
+# Clean out build directory to be sure we are doing a fresh build
+rm -r -fo *
+
 # Setup environment for dependencies
 $env:CMAKE_PREFIX_PATH = $DEP_DIR
 

scripts/superbuild/dependencies/dep_embree.cmake

@@ -41,7 +41,6 @@ if (BUILD_EMBREE_FROM_SOURCE)
       -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
       -DCMAKE_INSTALL_DOCDIR=${CMAKE_INSTALL_DOCDIR}
       -DCMAKE_INSTALL_BINDIR=${CMAKE_INSTALL_BINDIR}
-      -DEMBREE_ISPC_SUPPORT=ON
       $<$<BOOL:${DOWNLOAD_TBB}>:-DEMBREE_TBB_ROOT=${TBB_PATH}>
       $<$<BOOL:${DOWNLOAD_ISPC}>:-DEMBREE_ISPC_EXECUTABLE=${ISPC_PATH}>
       -DCMAKE_BUILD_TYPE=${DEPENDENCIES_BUILD_TYPE}