From 2a34514e9c2b1344bcd7b20808038507bb66a623 Mon Sep 17 00:00:00 2001
From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Mon, 17 Oct 2022 13:40:07 +0200
Subject: [PATCH] Windows: cleanup

---
 products/Sphinx.pyconf                      |  5 +++--
 products/compil_scripts/ParaView-5.11.0.bat |  2 +-
 products/compil_scripts/openVKL-0.11.0.bat  | 13 +++++++++++--
 products/graphviz.pyconf                    |  1 +
 products/openVKL.pyconf                     | 12 ++++++++++++
 5 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/products/Sphinx.pyconf b/products/Sphinx.pyconf
index de2af97..e40d40b 100644
--- a/products/Sphinx.pyconf
+++ b/products/Sphinx.pyconf
@@ -34,16 +34,17 @@ default_win :
     properties:
     {
       incremental : "yes"
-      pip : "no"
+      pip : "yes"
     }
 }
 
+
 version_2_1_2:
 {
    depend : ["Python", "setuptools", "Pygments", "Jinja2", "docutils", "sphinxcontrib_applehelp", "sphinxcontrib_serializinghtml","sphinxcontrib_websupport", "sphinxcontrib_htmlhelp", "sphinxcontrib_qthelp", "sphinxcontrib_devhelp", "sphinxcontrib_jsmath", "packaging", "requests", "imagesize", "alabaster", "Babel", "snowballstemmer", "markupsafe"]
-
 }
 
+
 version_1_7_6_no_pip:
 {
     properties:
diff --git a/products/compil_scripts/ParaView-5.11.0.bat b/products/compil_scripts/ParaView-5.11.0.bat
index e284301..1e02b92 100644
--- a/products/compil_scripts/ParaView-5.11.0.bat
+++ b/products/compil_scripts/ParaView-5.11.0.bat
@@ -146,7 +146,7 @@ REM ZLIB settings
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_MODULE_USE_EXTERNAL_VTK_zlib:BOOL=ON 
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DZLIB_INCLUDE_DIR:STRING=%ZLIB_ROOT_DIR:\=/%/include
 if %SAT_DEBUG% == 0 (
-  set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DZLIB_LIBRARY:STRING=%ZLIB_ROOT_DIR:\=/%/bin/zlib.lib
+  set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DZLIB_LIBRARY:STRING=%ZLIB_ROOT_DIR:\=/%/lib/zlib.lib
 ) else (
   set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DZLIB_LIBRARY:STRING=%ZLIB_ROOT_DIR:\=/%/lib/zlibd.lib
 )
diff --git a/products/compil_scripts/openVKL-0.11.0.bat b/products/compil_scripts/openVKL-0.11.0.bat
index 524ffbd..e26f986 100644
--- a/products/compil_scripts/openVKL-0.11.0.bat
+++ b/products/compil_scripts/openVKL-0.11.0.bat
@@ -24,8 +24,17 @@ SET CMAKE_OPTIONS=
 SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/%
 SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE:STRING=%PRODUCT_BUILD_TYPE%
 SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
-SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPYTHON_EXECUTABLE=%PYTHON_ROOT_DIR:\=/%/python.exe
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dembree_DIR:PATH=%EMBREE_ROOT_DIR:\=/%
+SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dembree_DIR:PATH=%EMBREE_ROOT_DIR:\=/%
+SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DTBB_PATH=%TBB_ROOT_DIR:\=/%
+SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -Drkcommon_DIR=%rkcommon_DIR/\=/%
+SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBUILD_TESTING=OFF
+SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_LIBDIR=lib
+SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBUILD_EXAMPLES=OFF
+SET CMAKE_OPYIONS=%CMAKE_OPTIONS% -DBUILD_TBB=OFF
+SET CMAKE_OPYIONS=%CMAKE_OPTIONS% -DBUILD_RKCOMMON=OFF
+SET CMAKE_OPYIONS=%CMAKE_OPTIONS% -DBUILD_EMBREE=OFF
+SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_PREFIX_PATH:PATH=${CMAKE_PREFIX_PATH}
+SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DRKCOMMON_TBB_ROOT=%TBB_ROOT_DIR:\=/%
 SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR="Visual Studio 15 2017 Win64"
 cd %BUILD_DIR%
 
diff --git a/products/graphviz.pyconf b/products/graphviz.pyconf
index 0fac882..96d1b42 100755
--- a/products/graphviz.pyconf
+++ b/products/graphviz.pyconf
@@ -48,6 +48,7 @@ version_2_44_1 :
 
 version_2_44_1_win :
 {
+   archive_info : {archive_name : "graphviz-2.44.1.tar.gz"}
     build_source : "script"
     compil_script :  "graphviz-2.44.1" + $VARS.scriptExtension
     depend : ['expat','zlib','libpng','libxml2', 'libjpeg']
diff --git a/products/openVKL.pyconf b/products/openVKL.pyconf
index f1143f4..b63dbbb 100644
--- a/products/openVKL.pyconf
+++ b/products/openVKL.pyconf
@@ -28,4 +28,16 @@ default_win:
       incremental : "yes"
       single_install_dir : "yes"
     }
+    depend : ['Python', 'tbb', 'ispc', 'rkCommon', 'embree', 'pthreads']
+    build_depend : ['cmake']
+}
+
+version_0_11_0:
+{
+}
+
+version_0_11_0_win:
+{
+  build_source : "script"
+  compil_script: "openVKL-0.11.0.bat"
 }
-- 
2.39.2