Merge from V6_main 28/02/2013

diff --git a/build_cmake b/build_cmake
index a81bdd4dad8aa6853582be0c488c43679aeed516..2868335ca1942cb8eb18504e3f4f368b6f467130 100755 (executable)
--- a/build_cmake
+++ b/build_cmake
@@ -21,7 +21,7 @@
 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 --jobmanager
+python $KERNEL_ROOT_DIR/salome_adm/cmake_files/deprecated/am2cmake.py --jobmanager
 status=$?
 cd ${CURRENT_DIR}
 exit $status

diff --git a/build_cmake.bat b/build_cmake.bat
index b669ddb5a54ae6f1329811b1e8e0bbf1a0ce91b1..4ce136f55e724be65746eb2026613901a005e8b7 100644 (file)
--- 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 --jobmanager\r
+%PYTHONBIN% %KERNEL_ROOT_DIR%\salome_adm\cmake_files\deprecated\am2cmake.py --jobmanager\r