Merge from V5_1_2_BR branch (14 July 2009)

diff --git a/Makefile.am b/Makefile.am
index d3ca9b66b2c498d706cd5404622154c51206c0fe..6990941914447f8616b2cd2558ed9d7b42b3bf32 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,7 +48,9 @@ salomeinclude_DATA = BLSURFPLUGIN_version.h
 
 EXTRA_DIST += \
        build_configure \
-       clean_configure
+       clean_configure \
+       build_cmake     \
+       build_cmake.bat
 
 dist-hook:
        rm -rf `find $(distdir) -name CVS`

diff --git a/adm_local/Makefile.am b/adm_local/Makefile.am
index 3f9a07d4b6b3027ed43f4df8f028aed0c8eeeada..1ec278e48bf5eb773b597c7012eebf463ad697f9 100644 (file)
--- a/adm_local/Makefile.am
+++ b/adm_local/Makefile.am
@@ -23,4 +23,4 @@
 #
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-SUBDIRS = unix
+SUBDIRS = unix cmake_files

diff --git a/adm_local/cmake_files/Makefile.am b/adm_local/cmake_files/Makefile.am
new file mode 100644 (file)
index 0000000..90e6b6d
--- /dev/null
+++ b/adm_local/cmake_files/Makefile.am
@@ -0,0 +1,28 @@
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+#  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+admlocal_cmakedir = $(admlocaldir)/cmake_files
+
+dist_admlocal_cmake_DATA = \
+FindBLSURF.cmake
+

diff --git a/configure.ac b/configure.ac
index 77cf7d6f63f8275a45896cc2de41e06ff86775d5..2779fec9d9a7fb506cd3537b769c0744a31f5f98 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -405,6 +405,7 @@ AC_OUTPUT([ \
   adm_local/Makefile \
   adm_local/unix/Makefile \
   adm_local/unix/config_files/Makefile \
+  adm_local/cmake_files/Makefile \
   doc/Makefile \
   doc/salome/Makefile \
   doc/salome/gui/Makefile \

diff --git a/doc/salome/gui/images/empty b/doc/salome/gui/images/empty
new file mode 100644 (file)
index 0000000..e69de29