spns #26828: convergence EDF: CentOS: uses lib64 so force lib

diff --git a/products/compil_scripts/PERSALYS-v11.0.sh b/products/compil_scripts/PERSALYS-v11.0.sh
index 8a35b5a3d1b7be8b8940e40409d16d703bcbe5c0..e280b70848a3a321990e37f0062e954b11069065 100755 (executable)
--- a/products/compil_scripts/PERSALYS-v11.0.sh
+++ b/products/compil_scripts/PERSALYS-v11.0.sh
@@ -13,6 +13,7 @@ fi
 
 CMAKE_OPTIONS=""
 CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=$PRODUCT_INSTALL"
+CMAKE_OPTIONS+=" -DCMAKE_INSTALL_LIBDIR:STRING=lib"
 CMAKE_OPTIONS+=" -DADAO_ROOT_DIR=$ADAO_ROOT_DIR"
 CMAKE_OPTIONS+=" -DADAO_INTERFACE_ROOT_DIR=$ADAO_INTERFACE_ROOT_DIR"
 #CMAKE_OPTIONS+=" -DBOOST_ROOT:PATH=${BOOST_ROOT_DIR}"

diff --git a/products/compil_scripts/netcdf-4.6.2.sh b/products/compil_scripts/netcdf-4.6.2.sh
index cf54ca31e279ef48f9f237522fd88df77403f216..af342c8adfe72f9e21044bc2c2fbcd55553eac78 100755 (executable)
--- a/products/compil_scripts/netcdf-4.6.2.sh
+++ b/products/compil_scripts/netcdf-4.6.2.sh
@@ -12,6 +12,7 @@ if [ -n "$SAT_HPC" ]  && [ -n "$MPI_ROOT_DIR" ]; then
 fi
 
 CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
+CMAKE_OPTIONS+=" -DCMAKE_INSTALL_LIBDIR:STRING=lib"
 CMAKE_OPTIONS+=" -DENABLE_NETCDF_4=ON"
 CMAKE_OPTIONS+=" -DENABLE_DAP=ON"
 CMAKE_OPTIONS+=" -BUILD_UTILITIES=ON"

diff --git a/products/compil_scripts/zeromq-4.3.1.sh b/products/compil_scripts/zeromq-4.3.1.sh
index e01996a4b1b8d9d8c788b39a3ca622a3f94674b3..ba892f1de1126f8c5e2381aae5a1cff0465db5d1 100755 (executable)
--- a/products/compil_scripts/zeromq-4.3.1.sh
+++ b/products/compil_scripts/zeromq-4.3.1.sh
@@ -13,6 +13,7 @@ fi
 
 CMAKE_OPTIONS=""
 CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
+CMAKE_OPTIONS+=" -DCMAKE_INSTALL_LIBDIR:STRING=lib"
 
 if [ -n "$TBB_ROOT_DIR" ] && [ "${TBB_ROOT_DIR}" != "/usr" ]; then
     CMAKE_OPTIONS+=" -DTBB_ROOT_DIR=${TBB_ROOT_DIR}"