X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=config_files%2FBLSURFPLUGIN.sh;h=11571c794dc280959b9754eb985c1f7b94220a6d;hb=5cfdf50f79998a3bb9fe787015b96eb2922532db;hp=8e12a78bc69e38c1ff0f46cbe9d8b9957d8a363d;hpb=ee6cfda02f6ff6d1f81281bdf7cf20cb45bc7ff7;p=tools%2Finstall.git diff --git a/config_files/BLSURFPLUGIN.sh b/config_files/BLSURFPLUGIN.sh index 8e12a78..11571c7 100755 --- a/config_files/BLSURFPLUGIN.sh +++ b/config_files/BLSURFPLUGIN.sh @@ -6,7 +6,7 @@ # Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com) # Project : SALOME # Module : Installation Wizard -# Copyright : 2002-2013 CEA +# Copyright : 2002-2014 CEA # # This script is the part of the SALOME installation procedure. # @@ -83,16 +83,16 @@ install_source # build sources test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR} -if [ -e ./build.sh ] ; then +if [ -e ./build.sh ] && [ ! -e ${INST_ROOT}/build.sh ]; then cp -f ./build.sh ${INST_ROOT} fi CUR_DIR=`pwd` cd ${INST_ROOT} if [ "${INST_WITH_GUI}" = "FALSE" ] ; then - check_jb ./build.sh -o -b -w -d -v 0 -p ${INST_ROOT} BLSURFPLUGIN + check_jb ./build.sh -d -p ${INST_ROOT} -DSALOME_BUILD_GUI=OFF BLSURFPLUGIN else - check_jb ./build.sh -o -b -d -v 0 -p ${INST_ROOT} BLSURFPLUGIN + check_jb ./build.sh -d -p ${INST_ROOT} BLSURFPLUGIN fi cd ${CUR_DIR} @@ -125,6 +125,8 @@ check_jb tar xfz ${SRC_DIR}/BLSURFPLUGINsourcesV${SALOME_VERSION}.tar.gz -C ${IN # modify all *.la files export BLSURFPLUGIN_ROOT_DIR=${PRODUCT_DIR} test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR} +modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeBLSURFPLUGINConfig.cmake +modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeBLSURFPLUGINTargets-release.cmake # to generate environment scripts try_preinstalled