From: Nabil Ghodbane Date: Mon, 9 Nov 2020 10:35:18 +0000 (+0100) Subject: spns #20273 - use MAKE_OPTIONS X-Git-Tag: V9_6_0^2~13 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=41b100e108d9748c210c25df4721d238cf20373a;p=tools%2Fsat_salome.git spns #20273 - use MAKE_OPTIONS --- diff --git a/products/MEDCOUPLING.pyconf b/products/MEDCOUPLING.pyconf index e9bed61..7a10280 100644 --- a/products/MEDCOUPLING.pyconf +++ b/products/MEDCOUPLING.pyconf @@ -100,11 +100,21 @@ default_int64: version_V9_5_0 : { } + version_V9_5_0_win : { cmake_options : ' -DMEDCOUPLING_ENABLE_PYTHON=ON -DMEDCOUPLING_ENABLE_PARTITIONER=OFF -DMEDCOUPLING_ENABLE_RENUMBER=ON -DMEDCOUPLING_PARTITIONER_METIS=ON -DMEDCOUPLING_PARTITIONER_SCOTCH=OFF -DMEDCOUPLING_PARTITIONER_PARMETIS=OFF -DMEDCOUPLING_MICROMED=OFF -DMEDCOUPLING_USE_MPI=OFF ' } +version_V9_4_0 : +{ +} + +version_V9_4_0_win : +{ + cmake_options : ' -DMEDCOUPLING_ENABLE_PYTHON=ON -DMEDCOUPLING_ENABLE_PARTITIONER=OFF -DMEDCOUPLING_ENABLE_RENUMBER=ON -DMEDCOUPLING_PARTITIONER_METIS=ON -DMEDCOUPLING_PARTITIONER_SCOTCH=OFF -DMEDCOUPLING_PARTITIONER_PARMETIS=OFF -DMEDCOUPLING_MICROMED=OFF -DMEDCOUPLING_USE_MPI=OFF ' +} + version_7_8_2_to_8_4_0 : { depend : [ diff --git a/products/compil_scripts/boost.sh b/products/compil_scripts/boost.sh index cbb9fae..6d8ac90 100755 --- a/products/compil_scripts/boost.sh +++ b/products/compil_scripts/boost.sh @@ -17,9 +17,9 @@ then exit 1 fi -echo "*** bjam install" +echo "*** bjam ${MAKE_OPTIONS} install" -./bjam -j4 install +./bjam ${MAKE_OPTIONS} install if [ $? -ne 0 ] then diff --git a/products/compil_scripts/lapack.sh b/products/compil_scripts/lapack.sh index 5a482a8..bd63705 100755 --- a/products/compil_scripts/lapack.sh +++ b/products/compil_scripts/lapack.sh @@ -34,8 +34,8 @@ then fi echo -echo "*** make -j4" -make -j4 +echo "*** make ${MAKE_OPTIONS}" +make ${MAKE_OPTIONS} if [ $? -ne 0 ] then echo "ERROR on make" diff --git a/products/compil_scripts/netgen_5_3_1.sh b/products/compil_scripts/netgen_5_3_1.sh index 793338b..dd148ae 100755 --- a/products/compil_scripts/netgen_5_3_1.sh +++ b/products/compil_scripts/netgen_5_3_1.sh @@ -89,8 +89,8 @@ then fi echo -echo "*** compile" -make -j4 +echo "*** make ${MAKE_OPTIONS}" +make ${MAKE_OPTIONS} if [ $? -ne 0 ] then echo "error on make"