From d449c2e236105f5120e82e024a1cfb5c6fd1c913 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Fri, 14 Oct 2022 11:17:16 +0200 Subject: [PATCH] PERSALYS compilation attempts on Windows - vetoe openVKL until fixed --- applications/SALOME-master-windows.pyconf | 2 +- products/ospray.pyconf | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf index ce97483..e5eb70e 100644 --- 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 60f9bc1..ca1cc09 100644 --- 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. -- 2.39.2