PERSALYS compilation attempts on Windows - vetoe openVKL until fixed

diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf
index ce974839f70b7914cd2c7ad0954390dfde2bdd71..e5eb70e210b99ebca659bb57188aef122186067b 100644 (file)
--- a/applications/SALOME-master-windows.pyconf
+++ b/applications/SALOME-master-windows.pyconf
@@ -87,7 +87,7 @@ APPLICATION :
         omniORB : '4.2.3'
         omniORBpy : '4.2.3'
         opencv : '3.2.0'
-        openVKL: '0.11.0'
+        #openVKL: '0.11.0'
         openturns: '1.19'
         ospray : '2.4.0'
         packaging : '19.0'

diff --git a/products/ospray.pyconf b/products/ospray.pyconf
index 60f9bc1ff0ff70ac77fe2408b9a94c75036d77dc..ca1cc099dbfd11aaa58a14252fc63bc22c54cfd0 100644 (file)
--- a/products/ospray.pyconf
+++ b/products/ospray.pyconf
@@ -35,6 +35,12 @@ version_2_4_0 :
   depend : ['embree','openVKL', 'rkCommon']
 }
 
+version_2_4_0_win :
+{
+    cmake_options : '  -Dembree_DIR=%embree_DIR:\=/% -DTBB_ROOT=%TBB_DIR:\=/% -DOSPRAY_TASKING_SYSTEM=TBB  -DOSPRAY_ENABLE_APPS=OFF -DOSPRAY_ENABLE_TUTORIALS=OFF '
+    depend : ['embree']
+}
+
 version_1_7_3 :
 {
     # OSPRAY_ENABLE_APPS not needed here, otherwise compilation issues on several Fedora nodes.