merge from master

[tools/sat_salome.git] / products / compil_scripts / ADAO.sh

diff --git a/products/compil_scripts/ADAO.sh b/products/compil_scripts/ADAO.sh
index 85c145409b80dff8227184bc586ad36f614575c8..72d3ead0b5434a4dbba2263d7abc33352f5dbd77 100755 (executable)
--- a/products/compil_scripts/ADAO.sh
+++ b/products/compil_scripts/ADAO.sh
@@ -14,8 +14,8 @@ echo "##########################################################################
 export CURRENT_SOFTWARE_INSTALL_DIR=${PRODUCT_INSTALL}
 
 CMAKE_OPTIONS=""
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_EXECUTABLE=${PYTHONBIN}"
+CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
+CMAKE_OPTIONS+=" -DPYTHON_EXECUTABLE=${PYTHONBIN}"
 
 echo
 echo "*** cmake" ${CMAKE_OPTIONS}
@@ -48,16 +48,16 @@ echo "Compile ADAO MODULE"
 echo "##########################################################################"
 export ADAO_PYTHON_ROOT_DIR=${CURRENT_SOFTWARE_INSTALL_DIR}
 export ADAO_ENGINE_ROOT_DIR==${CURRENT_SOFTWARE_INSTALL_DIR}
-export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION:0:3}/site-packages:$PYTHONPATH
+export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH
 
 
 CMAKE_OPTIONS=""
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DADAO_PYTHON_MODULE=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_EXECUTABLE=${PYTHONBIN}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DKERNEL_ROOT_DIR=${KERNEL_ROOT_DIR}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DADAO_PYTHON_ROOT_DIR=${ADAO_PYTHON_ROOT_DIR}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DEFICAS_ROOT_DIR=${EFICAS_TOOLS_ROOT_DIR}"
+CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
+CMAKE_OPTIONS+=" -DADAO_PYTHON_MODULE=OFF"
+CMAKE_OPTIONS+=" -DPYTHON_EXECUTABLE=${PYTHONBIN}"
+CMAKE_OPTIONS+=" -DKERNEL_ROOT_DIR=${KERNEL_ROOT_DIR}"
+CMAKE_OPTIONS+=" -DADAO_PYTHON_ROOT_DIR=${ADAO_PYTHON_ROOT_DIR}"
+CMAKE_OPTIONS+=" -DEFICAS_ROOT_DIR=${EFICAS_TOOLS_ROOT_DIR}"
 
 echo
 echo "*** cmake" ${CMAKE_OPTIONS}