From f0ad6dcd852f8e12bac4fcbee574968baa268e62 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Thu, 27 Oct 2022 17:23:44 +0200 Subject: [PATCH] generic boost - compilation --- products/ParaView.pyconf | 8 +++++--- products/compil_scripts/ParaView-5.11.0.bat | 2 +- products/compil_scripts/TTK.bat | 2 +- products/compil_scripts/planegcs.bat | 2 +- products/env_scripts/boost.py | 8 ++++---- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/products/ParaView.pyconf b/products/ParaView.pyconf index 55ac992..7be3736 100755 --- a/products/ParaView.pyconf +++ b/products/ParaView.pyconf @@ -49,7 +49,7 @@ version_5_11_0_int32 : version_5_11_0_win : { compil_script : 'ParaView-5.11.0.bat' - archive_info : {archive_name : "ParaView-5.11.0-08c5d057a8.tar.gz"} + archive_info : {archive_name : "ParaView-5.11.0-RC2.tar.gz"} depend : [ 'Python', 'hdf5', @@ -64,7 +64,8 @@ version_5_11_0_win : ] opt_depend : ['openmpi', 'ospray','tbb', 'openturns', 'rkCommon', 'matplotlib'] patches : ['paraview-5.11.0.p001-FindCGNS.patch', - 'paraview-5.11.0.p002-FindMPI.patch' + 'paraview-5.11.0.p002-FindMPI.patch', + 'paraview-5.11.0.p004-vtkUniformHyperTreeGrid.patch' ] } @@ -86,7 +87,8 @@ version_5_11_0_win_dbg : ] opt_depend : ['openmpi', 'ospray','tbb', 'openturns', 'rkCommon', 'matplotlib'] patches : ['paraview-5.11.0.p001-FindCGNS.patch', - 'paraview-5.11.0.p002-FindMPI.patch' + 'paraview-5.11.0.p002-FindMPI.patch', + 'paraview-5.11.0.p004-vtkUniformHyperTreeGrid.patch' ] } diff --git a/products/compil_scripts/ParaView-5.11.0.bat b/products/compil_scripts/ParaView-5.11.0.bat index 88795a6..800c2de 100644 --- a/products/compil_scripts/ParaView-5.11.0.bat +++ b/products/compil_scripts/ParaView-5.11.0.bat @@ -118,7 +118,7 @@ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPARAVIEW_ENABLE_VISITBRIDGE:BOOL=ON REM Boost settings set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBOOST_ROOT:PATH=%BOOST_ROOT_DIR:\=/% -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBoost_ADDITIONAL_VERSIONS="%Boost_ADDITIONAL_VERSIONS%" +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBoost_ADDITIONAL_VERSIONS=%Boost_ADDITIONAL_VERSIONS% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBOOST_INCLUDEDIR=%Boost_INCLUDE_DIR:\=/% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBoost_INCLUDE_DIR=%Boost_INCLUDE_DIR:\=/% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBoost_NO_BOOST_CMAKE:BOOL=ON diff --git a/products/compil_scripts/TTK.bat b/products/compil_scripts/TTK.bat index d92438c..fe69430 100644 --- a/products/compil_scripts/TTK.bat +++ b/products/compil_scripts/TTK.bat @@ -32,7 +32,7 @@ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR="Visual Studio 15 2017 Win64 REM Boost settings set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBOOST_ROOT:PATH=%BOOST_ROOT_DIR:\=/% -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBoost_ADDITIONAL_VERSIONS="%Boost_ADDITIONAL_VERSIONS%" +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBoost_ADDITIONAL_VERSIONS=%Boost_ADDITIONAL_VERSIONS% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBOOST_INCLUDEDIR=%Boost_INCLUDE_DIR:\=/% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBoost_INCLUDE_DIR=%Boost_INCLUDE_DIR:\=/% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBoost_NO_BOOST_CMAKE:BOOL=ON diff --git a/products/compil_scripts/planegcs.bat b/products/compil_scripts/planegcs.bat index 447a313..f82c44e 100644 --- a/products/compil_scripts/planegcs.bat +++ b/products/compil_scripts/planegcs.bat @@ -26,7 +26,7 @@ SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX=%PRODUCT_INSTALL:\=/% REM Boost settings set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBOOST_ROOT=%BOOST_ROOT_DIR:\=/% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBOOST_ROOT:PATH=%BOOST_ROOT_DIR:\=/% -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBoost_ADDITIONAL_VERSIONS="%Boost_ADDITIONAL_VERSIONS%" +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBoost_ADDITIONAL_VERSIONS=%Boost_ADDITIONAL_VERSIONS% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBOOST_INCLUDEDIR=%Boost_INCLUDE_DIR:\=/% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBoost_INCLUDE_DIR=%Boost_INCLUDE_DIR:\=/% diff --git a/products/env_scripts/boost.py b/products/env_scripts/boost.py index 59b8d68..9721789 100755 --- a/products/env_scripts/boost.py +++ b/products/env_scripts/boost.py @@ -10,10 +10,10 @@ def set_env(env, prereq_dir, version): env.set('BOOSTDIR', prereq_dir) env.set('BOOST_ROOT_DIR', prereq_dir) env.set('BOOST_ROOT', prereq_dir) - env.set('BOOST_INCLUDE_DIR',os.path.join(prereq_dir,'include','boost-' + '_'.join(version.split('.')[0:2]),'boost')) - env.set('Boost_INCLUDE_DIR',os.path.join(prereq_dir,'include','boost-' + '_'.join(version.split('.')[0:2]),'boost')) - env.set('BOOST_INCLUDEDIR', os.path.join(prereq_dir,'include','boost-' + '_'.join(version.split('.')[0:2]),'boost')) - env.set('Boost_ADDITIONAL_VERSIONS',"'" + version + " " + '.'.join(version.split('.')[0:2]) + "'") + env.set('BOOST_INCLUDE_DIR',os.path.join(prereq_dir,'include','boost-' + '_'.join(version.split('.')[0:2]))) + env.set('Boost_INCLUDE_DIR',os.path.join(prereq_dir,'include','boost-' + '_'.join(version.split('.')[0:2]))) + env.set('BOOST_INCLUDEDIR', os.path.join(prereq_dir,'include','boost-' + '_'.join(version.split('.')[0:2]))) + env.set('Boost_ADDITIONAL_VERSIONS',"\"" + version + " " + '.'.join(version.split('.')[0:2]) + "\"") env.set('BOOST_LIBRARY_DIR',os.path.join(prereq_dir,'lib')) env.set('BOOST_LIBRARYDIR',os.path.join(prereq_dir,'lib')) env.prepend('PATH', os.path.join(prereq_dir, 'lib')) -- 2.39.2