From 8ed51b18ba11348e45ebe09fce58151d75cd7090 Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 24 Jan 2012 14:59:27 +0000 Subject: [PATCH] 0021481: [CEA 538] autoconf and med 3 --- configure.ac | 8 ++++---- src/SMESHGUI/Makefile.am | 2 +- src/Tools/MeshCut/Makefile.am | 4 ++-- src/Tools/padder/resources/padderexe/envPadder.sh.in | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index f7569d1ce..13a84e59a 100644 --- a/configure.ac +++ b/configure.ac @@ -345,11 +345,11 @@ CHECK_HDF5 echo echo --------------------------------------------- -echo testing MED2 +echo testing MED3 echo --------------------------------------------- echo -CHECK_MED2 +CHECK_MED3 echo echo --------------------------------------------- @@ -435,9 +435,9 @@ echo Configure if test "${gui_ok}" = "yes"; then variables="cc_ok fortran_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok cgns_ok omniORB_ok occ_ok doxygen_ok graphviz_ok sphinx_ok qwt_ok Kernel_ok Geom_ok Med_ok gui_ok" elif test "${SalomeGUI_need}" != "no"; then - variables="cc_ok fortran_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok vtk_ok hdf5_ok cgns_ok med2_ok omniORB_ok occ_ok doxygen_ok graphviz_ok sphinx_ok Kernel_ok Geom_ok Med_ok gui_ok" + variables="cc_ok fortran_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok vtk_ok hdf5_ok cgns_ok med3_ok omniORB_ok occ_ok doxygen_ok graphviz_ok sphinx_ok Kernel_ok Geom_ok Med_ok gui_ok" else - variables="cc_ok fortran_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok vtk_ok hdf5_ok cgns_ok med2_ok omniORB_ok occ_ok doxygen_ok graphviz_ok sphinx_ok Kernel_ok Geom_ok Med_ok" + variables="cc_ok fortran_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok vtk_ok hdf5_ok cgns_ok med3_ok omniORB_ok occ_ok doxygen_ok graphviz_ok sphinx_ok Kernel_ok Geom_ok Med_ok" fi for var in $variables diff --git a/src/SMESHGUI/Makefile.am b/src/SMESHGUI/Makefile.am index ba8b05170..541933a88 100644 --- a/src/SMESHGUI/Makefile.am +++ b/src/SMESHGUI/Makefile.am @@ -250,7 +250,7 @@ libSMESH_la_CPPFLAGS = \ $(BOOST_CPPFLAGS) \ $(CORBA_CXXFLAGS) \ $(CORBA_INCLUDES) \ - $(MED2_INCLUDES) \ + $(MED3_INCLUDES) \ $(HDF5_INCLUDES) \ -I$(srcdir)/../OBJECT \ -I$(srcdir)/../SMESHFiltersSelection \ diff --git a/src/Tools/MeshCut/Makefile.am b/src/Tools/MeshCut/Makefile.am index c1cecffd9..e191e4e01 100644 --- a/src/Tools/MeshCut/Makefile.am +++ b/src/Tools/MeshCut/Makefile.am @@ -38,9 +38,9 @@ MeshCut_SOURCES = \ MeshCut_Cas.cxx \ MeshCut_DC.cxx -MeshCut_CPPFLAGS = $(MED2_INCLUDES) +MeshCut_CPPFLAGS = $(MED3_INCLUDES) -MeshCut_LDFLAGS = $(MED2_LIBS) $(HDF5_LIBS) +MeshCut_LDFLAGS = $(MED3_LIBS) $(HDF5_LIBS) diff --git a/src/Tools/padder/resources/padderexe/envPadder.sh.in b/src/Tools/padder/resources/padderexe/envPadder.sh.in index 31c84a598..521f57746 100644 --- a/src/Tools/padder/resources/padderexe/envPadder.sh.in +++ b/src/Tools/padder/resources/padderexe/envPadder.sh.in @@ -2,7 +2,7 @@ # This script defines the shell extension required for executing the # padder executable program on the localhost (for test purposes) -MED_ROOT="@MED2HOME@" +MED_ROOT="@MED3HOME@" HDF_ROOT="@HDF5HOME@" CGAL_ROOT="/usr" export LD_LIBRARY_PATH="$MED_ROOT/lib:$HDF_ROOT/lib:$CGAL_ROOT/lib:$LD_LIBRARY_PATH" -- 2.39.2