Merge from BR_PARAVIS_LOT1_2 02/03/2010

diff --git a/adm_local/Makefile.am b/adm_local/Makefile.am
index 9bca392c3703d5078606dd70553a31ddcba03bdc..0b7954458021c4372b8f37a4a2f901c718664a7c 100644 (file)
--- a/adm_local/Makefile.am
+++ b/adm_local/Makefile.am
@@ -21,4 +21,4 @@
 #
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-SUBDIRS = unix
\ No newline at end of file
+SUBDIRS = unix cmake_files

diff --git a/adm_local/cmake_files/FindVISU.cmake b/adm_local/cmake_files/FindVISU.cmake
new file mode 100644 (file)
index 0000000..c13c89e
--- /dev/null
+++ b/adm_local/cmake_files/FindVISU.cmake
@@ -0,0 +1,26 @@
+#  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
+#
+
+SET(VISU_CXXFLAGS -I${VISU_ROOT_DIR}/include/salome)
+SET(VISU_LDFLAGS -L${VISU_ROOT_DIR}/lib/salome)
+
+FIND_LIBRARY(SalomeIDLVISU SalomeIDLVISU ${VISU_ROOT_DIR}/lib/salome)

diff --git a/adm_local/cmake_files/Makefile.am b/adm_local/cmake_files/Makefile.am
new file mode 100644 (file)
index 0000000..08b55cd
--- /dev/null
+++ b/adm_local/cmake_files/Makefile.am
@@ -0,0 +1,25 @@
+#  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
+
+dist_admlocal_cmake_DATA = \
+FindVISU.cmake

diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am
index 958becf8564566d11855aa565cddef256ebfbc82..dba276dd64e65e3c80c9113002a554605b6ed376 100644 (file)
--- a/adm_local/unix/make_common_starter.am
+++ b/adm_local/unix/make_common_starter.am
@@ -57,6 +57,9 @@ admlocaldir        = $(prefix)/adm_local
 admlocalunixdir    = $(admlocaldir)/unix
 admlocalm4dir      = $(admlocaldir)/unix/config_files
 
+# Directory for install cmake files
+admlocal_cmakedir = $(admlocaldir)/cmake_files
+
 # Shared modules installation directory
 sharedpkgpythondir = $(salomepythondir)/shared_modules
 

diff --git a/configure.ac b/configure.ac
index 0edb7812631e05de08ea55fa3fb946be7a205e58..e0080ef8698761eec60b79ef4792a4610a32a6d3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -366,6 +366,7 @@ AC_OUTPUT([ \
        Makefile \
        VISU_version.h \
        adm_local/Makefile \
+       adm_local/cmake_files/Makefile \
        adm_local/unix/Makefile \
        adm_local/unix/config_files/Makefile \
        bin/Makefile \