use V9_10_0a2 for SMESH for all platforms but DB09 and DB10

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index e37a4f9057527cca4c8a0fba8f357e3f08b71d9a..bf23f2d9b5b4addfa7f6f8363c6fe320d41f2d86 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -148,7 +148,7 @@ APPLICATION :
         'MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
         'GUI'
         'GEOM'
-        'SMESH'
+        'SMESH' : 'V9_10_0a2'
         'NETGENPLUGIN'
         'BLSURFPLUGIN'
         'GHS3DPLUGIN'
@@ -235,6 +235,7 @@ __overwrite__ :
         #   - Qt minimal version 5.12
         #   - xmlpatterns executable
         __condition__ : "VARS.dist in ['DB10']"
+        'APPLICATION.products.SMESH'    : 'master'
         'APPLICATION.products.opencv'   : '3.2.0'
         'APPLICATION.products.cminpack' : 'native'
         'APPLICATION.products.PyFMI'    : {tag:'2.6',     base: 'no',  section: 'version_2_6_no_pip'                  }

diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf
index 51c957b05c21b15bf15491e6b3326f4cddba35a6..c412f8c41c565222b8e55d450884737d069d4274 100644 (file)
--- a/applications/SALOME-master-windows.pyconf
+++ b/applications/SALOME-master-windows.pyconf
@@ -143,7 +143,7 @@ APPLICATION :
         'MEDCOUPLING'
         'GUI'
         'GEOM'
-        'SMESH'
+        'SMESH' : 'V9_10_0a2'
         'NETGENPLUGIN'
         'BLSURFPLUGIN'
         'GHS3DPLUGIN'

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index 5cdcd57bed8b6dc91dca4ea98d08551bc18b8219..1c45c5f926501e9c239a193e9412c7f048ef6c99 100644 (file)
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -150,7 +150,7 @@ APPLICATION :
         'MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
         'GUI'
         'GEOM'
-        'SMESH'
+        'SMESH' : 'V9_10_0a2'
         'NETGENPLUGIN'
         'BLSURFPLUGIN'
         'GHS3DPLUGIN'
@@ -228,10 +228,15 @@ __overwrite__ :
         'APPLICATION.products.gdal'     : {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_CO8'                 } # spns #29324
         'APPLICATION.products.ParaView' : {tag: '5.11.0', base: 'no', section: 'version_5_11_0_MPI_CO8', hpc: 'yes'}
     }
+    {
+        __condition__ : "VARS.dist in ['DB09']"
+        'APPLICATION.products.SMESH' : 'master'
+    }
     {
         __condition__ : "VARS.dist in ['DB10']"
         'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr']
         'APPLICATION.products.gdal': {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_DB10'} # spns #29324
+        'APPLICATION.products.SMESH' : 'master'
     }
     {
         __condition__ : "VARS.dist in ['UB18.04']"

diff --git a/products/compil_scripts/ParaView-5.11.0.bat b/products/compil_scripts/ParaView-5.11.0.bat
index 1e02b92809a6ff96ab2e5d093dee6ae5038704a2..88795a688da17dc3ea16ec31d14e30dbce1fa32b 100644 (file)
--- a/products/compil_scripts/ParaView-5.11.0.bat
+++ b/products/compil_scripts/ParaView-5.11.0.bat
@@ -118,9 +118,9 @@ 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="1.67.0 1.67"
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBOOST_INCLUDEDIR=%BOOST_ROOT_DIR:\=/%/include/boost-1_67
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBoost_INCLUDE_DIR=%BOOST_ROOT_DIR:\=/%/include/boost-1_67
+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
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBoost_NO_SYSTEM_PATHS:BOOL=ON
 

diff --git a/products/compil_scripts/TTK.bat b/products/compil_scripts/TTK.bat
index 0f29c996d8056317002aef55e5a40b8b328083f9..d92438cd2af078b36e445e8f5dd358202ebc7aa0 100644 (file)
--- a/products/compil_scripts/TTK.bat
+++ b/products/compil_scripts/TTK.bat
@@ -32,9 +32,9 @@ 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="1.67.0 1.67"
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBOOST_INCLUDEDIR=%BOOST_ROOT_DIR:\=/%/include/boost-1_67
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBoost_INCLUDE_DIR=%BOOST_ROOT_DIR:\=/%/include/boost-1_67
+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
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBoost_NO_SYSTEM_PATHS:BOOL=ON
 rem SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBoost_USE_STATIC_LIBS=OFF

diff --git a/products/compil_scripts/boost_V1.79.0.bat b/products/compil_scripts/boost_V1.79.0.bat
new file mode 100644 (file)
index 0000000..24f43a2
--- /dev/null
+++ b/products/compil_scripts/boost_V1.79.0.bat
@@ -0,0 +1,56 @@
+@echo off
+
+echo ##########################################################################
+echo BOOST %VERSION%
+echo ##########################################################################
+
+IF NOT DEFINED SAT_DEBUG (
+  SET SAT_DEBUG=0
+)
+
+IF NOT DEFINED CMAKE_GENERATOR (
+  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+)
+
+SET PRODUCT_BUILD_TYPE=release
+
+REM TODO: NGH: not Tested yet
+if %SAT_DEBUG% == 1 (
+  set PRODUCT_BUILD_TYPE=debug
+)
+
+if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%
+if NOT exist "%PRODUCT_INSTALL%\include" mkdir %PRODUCT_INSTALL%\include
+
+REM clean BUILD directory
+if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR%
+mkdir %BUILD_DIR%
+cd %SOURCE_DIR%
+xcopy * %BUILD_DIR%\ /E /I /Q /Y
+cd %BUILD_DIR%
+
+set VC_VERSION=vc141
+
+call bootstrap.bat %VC_VERSION%
+
+echo.
+echo --------------------------------------------------------------------------
+echo *** Compilation
+echo --------------------------------------------------------------------------
+
+set PLATFORM_TARGET=64
+if "%SALOME_APPLICATION_NAME%" == URANIE (
+  set PLATFORM_TARGET=32
+)
+
+.\b2 --help
+
+.\b2 --prefix=%PRODUCT_INSTALL% address-model=%PLATFORM_TARGET%  --build-type=complete stage variant=%PRODUCT_BUILD_TYPE% threading=multi link=shared runtime-link=shared install
+if NOT %ERRORLEVEL% == 0 (
+    echo ERROR running b2
+    exit 1
+)
+
+
+echo.
+echo ########## END

diff --git a/products/compil_scripts/planegcs.bat b/products/compil_scripts/planegcs.bat
index 4441e59fd8d181440550f1f13bb8ddec374fd60c..447a313b0e1530afd922d6c5a977bf8a9a9ecada 100644 (file)
--- a/products/compil_scripts/planegcs.bat
+++ b/products/compil_scripts/planegcs.bat
@@ -26,9 +26,9 @@ 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="1.67.0" "1.67"
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBOOST_INCLUDEDIR=%BOOST_ROOT_DIR:\=/%/include/boost-1_67
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBoost_INCLUDE_DIR=%BOOST_ROOT_DIR:\=/%/include/boost-1_67
+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:\=/%
 
 if defined CMAKE_GENERATOR (
     set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%

diff --git a/products/compil_scripts/root-6.24.bat b/products/compil_scripts/root-6.24.bat
index 9d76ea86f43cf8849baf07aa557da9b549b44d4b..b35bff49f79ab1e6a22ecf6be67dab2a12d456a4 100644 (file)
--- a/products/compil_scripts/root-6.24.bat
+++ b/products/compil_scripts/root-6.24.bat
@@ -45,9 +45,6 @@ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dbuiltin_xxhash=OFF
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dbuiltin_zlib=OFF
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dbuiltin_zstd=OFF
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dmathmore=OFF
-rem set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBOOST_ROOT:PATH=%BOOST_ROOT_DIR:\=/%
-rem set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBoost_ADDITIONAL_VERSIONS="1.67.0 1.67"
-rem set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBOOST_INCLUDEDIR=%BOOST_ROOT_DIR:\=/%/include/boost-1_67
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_SYSTEM_VERSION=10.0.19041.0
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
 

diff --git a/products/env_scripts/boost.py b/products/env_scripts/boost.py
index 42e2bca37642e1e5f6e21258e6bc4567136f3918..59b8d688acdb855ca44507be35f3ef2069dbdd65 100755 (executable)
--- a/products/env_scripts/boost.py
+++ b/products/env_scripts/boost.py
@@ -10,14 +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)
-    cmake_version = env.get('CMAKE_VERSION')
-    if '3.16.7' in cmake_version:
-      env.set('Boost_INCLUDE_DIR',os.path.join(prereq_dir,'include','boost-1_67','boost'))
-    else:
-      env.set('BOOST_INCLUDE_DIR',os.path.join(prereq_dir,'include','boost-1_67','boost'))
-      env.set('Boost_INCLUDE_DIR',os.path.join(prereq_dir,'include','boost-1_67','boost'))
-      env.set('BOOST_INCLUDEDIR',os.path.join(prereq_dir,'include','boost-1_67','boost'))
-    env.set('Boost_ADDITIONAL_VERSIONS',"'1.67.0 1.67'")
+    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_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'))