Merge from V6_main 28/02/2013

diff --git a/build_cmake b/build_cmake
index 1301f5705c5c35a9282a012f54f2ea079e97d392..cebe63f408fbbb9fcfb836dfc32afc4e60d27b2f 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 --yacs
+python $KERNEL_ROOT_DIR/salome_adm/cmake_files/deprecated/am2cmake.py --yacs
 status=$?
 cd ${CURRENT_DIR}
 exit $status

diff --git a/build_cmake.bat b/build_cmake.bat
index 18808578cf6eaa950dc0a99f6b9dfa297b82ed9e..4df64bce852239f34cbaf5668c6ad0b4d2640ead 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 --yacs\r
+%PYTHONBIN% %KERNEL_ROOT_DIR%\salome_adm\cmake_files\deprecated\am2cmake.py --yacs\r