spns #32377: boost environment issue - windows only

diff --git a/products/KERNEL.pyconf b/products/KERNEL.pyconf
index 649dad1013fcc698c0323cd10faa6d3bdc30fdc0..a7a536ee6cf7ba4e7827cccd47bc20ba366277ed 100644 (file)
--- a/products/KERNEL.pyconf
+++ b/products/KERNEL.pyconf
@@ -45,7 +45,7 @@ default :
 
 default_win :
 {
-    cmake_options : "-DSALOME_USE_LIBBATCH=ON -DCMAKE_GENERATOR=\"Visual Studio 15 2017 Win64\" -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR:\=/%/bin/swig.exe -DCMAKE_CXX_COMPILER_ARCHITECTURE_ID=x64 -DBOOST_ROOT=%BOOST_ROOT_DIR:\=/% -DBOOST_DEBUG=ON -DBoost_ADDITIONAL_VERSIONS=\"1.67.0\" \"1.67\" -DBOOST_INCLUDEDIR=%BOOST_ROOT_DIR:\=/%/include/boost-1_67 -DBOOST_LIBRARYDIR=%BOOST_ROOT_DIR:\=/%/lib -DSALOME_USE_64BIT_IDS=ON "
+    cmake_options : "-DSALOME_USE_LIBBATCH=ON -DCMAKE_GENERATOR=\"Visual Studio 15 2017 Win64\" -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR:\=/%/bin/swig.exe -DCMAKE_CXX_COMPILER_ARCHITECTURE_ID=x64 -DBOOST_ROOT=%BOOST_ROOT_DIR:\=/% -DBOOST_DEBUG=ON -DBoost_ADDITIONAL_VERSIONS=\"%BOOST_VERSION% %BOOST_VERSION_MajorMinor%\" -DBOOST_INCLUDEDIR=%Boost_INCLUDE_DIR:\=/% -DBOOST_LIBRARYDIR=%BOOST_LIBRARY_DIR:\=/%b -DSALOME_USE_64BIT_IDS=ON "
     depend : ["Python",
               "boost",
               "numpy",

diff --git a/products/compil_scripts/ParaView-5.11.0.bat b/products/compil_scripts/ParaView-5.11.0.bat
index 800c2debec83c5944f91927efe10cd45cfec5b1b..16c3a06e0a0af3c01d2d34c6b155f29229ff754f 100644 (file)
--- 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_VERSION% %BOOST_VERSION_MajorMinor%"
 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 f82c44e64f19f97a01465575a67fb3089870203f..aac53bcb01e648a94c231867b8da4b3de21386bb 100644 (file)
--- a/products/compil_scripts/planegcs.bat
+++ b/products/compil_scripts/planegcs.bat
@@ -23,10 +23,10 @@ set CMAKE_OPTIONS=
 SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE:STRING=%PRODUCT_BUILD_TYPE%
 SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX=%PRODUCT_INSTALL:\=/%
 
-REM Boost settings 
+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_VERSION% %BOOST_VERSION_MajorMinor%"
 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/compil_scripts/root.bat b/products/compil_scripts/root.bat
index 9d76ea86f43cf8849baf07aa557da9b549b44d4b..b35bff49f79ab1e6a22ecf6be67dab2a12d456a4 100644 (file)
--- a/products/compil_scripts/root.bat
+++ b/products/compil_scripts/root.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 97217895d5bb7cf4fb32e76e6bdc9cb7632ca2b1..e0687a82043f79b7203ab2c257420cc34d6802ab 100755 (executable)
--- a/products/env_scripts/boost.py
+++ b/products/env_scripts/boost.py
@@ -13,7 +13,8 @@ def set_env(env, prereq_dir, version):
     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_VERSION', version)
+    env.set('BOOST_VERSION_MajorMinor', '.'.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'))

diff --git a/salome-W10.pyconf b/salome-W10.pyconf
index dbd68e1779bce754beb46f90d5eecac7d76c618d..607b59e3be0438270a350b6a6e07725fe3743b41 100644 (file)
--- a/salome-W10.pyconf
+++ b/salome-W10.pyconf
@@ -13,7 +13,7 @@ PRODUCTPATH : $project_path + "\\products"
 # Where to search the pyconf of the jobs of the project
 JOBPATH : $project_path + r"\\jobs\\" 
 # Where to search for licences
-LICENCEPATH : "\\\titania\\home_projet\\salome-public\\prerequis\\LICENCE:\\\\terre\\data\\tmpsalome\\salome\\prerequis\\install\\LICENSE:/data/tmpsalome/salome/prerequis/install/LICENCE:/export/home/salome/prerequis/install/LICENCE:/volatile/salome/prerequis/install/LICENCE:/soft/commun/SALOME/LICENSE"
+LICENCEPATH : "\\\\titania\\home_projet\\salome-public\\prerequis\\LICENCE"
 
 git_info : 
 {