From: prascle Date: Fri, 1 Mar 2013 16:45:38 +0000 (+0000) Subject: PR: synchro V7_main tag mergefrom_V6_main_28Feb13 X-Git-Tag: distribGeom_06Mar13 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a2f5cc049920de5dd2376e72474b27c2fb3f16d0;p=plugins%2Fghs3dplugin.git PR: synchro V7_main tag mergefrom_V6_main_28Feb13 --- diff --git a/build_cmake b/build_cmake index 47bd15c..57364c4 100755 --- a/build_cmake +++ b/build_cmake @@ -21,7 +21,8 @@ CURRENT_DIR=`pwd` CONF_DIR=`echo $0 | sed -e "s,[^/]*$,,;s,/$,,;s,^$,.,"` cd ${CONF_DIR} -python $KERNEL_ROOT_DIR/salome_adm/cmake_files/am2cmake.py --ghs3dplugin +python $KERNEL_ROOT_DIR/salome_adm/cmake_files/deprecated/am2cmake.py --ghs3dplugin status=$? cd ${CURRENT_DIR} exit $status + diff --git a/build_cmake.bat b/build_cmake.bat index 5008649..d702932 100644 --- a/build_cmake.bat +++ b/build_cmake.bat @@ -17,4 +17,4 @@ @REM See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com @REM -%PYTHONBIN% %KERNEL_ROOT_DIR%\salome_adm\cmake_files\am2cmake.py --ghs3dplugin +%PYTHONBIN% %KERNEL_ROOT_DIR%\salome_adm\cmake_files\deprecated\am2cmake.py --ghs3dplugin diff --git a/configure.ac b/configure.ac index b89d2e2..01fc601 100644 --- a/configure.ac +++ b/configure.ac @@ -27,7 +27,7 @@ # Modified by : Marc Tajchman (CEA) # Created from configure.in.base # -AC_INIT([Salome2 Project GHS3DPLUGIN module],[6.6.0], [webmaster.salome@opencascade.com], [SalomeGHS3DPLUGIN]) +AC_INIT([Salome2 Project GHS3DPLUGIN module],[7.0.0], [webmaster.salome@opencascade.com], [SalomeGHS3DPLUGIN]) AC_CONFIG_AUX_DIR(adm_local/unix/config_files) AC_CANONICAL_HOST AC_CANONICAL_TARGET