ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-25 08:50:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

0021481: [CEA 538] autoconf and med 3

Browse Source
This commit is contained in:
vsr 2012-01-24 14:59:27 +00:00
parent 1ef48564e5
commit 8ed51b18ba
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View File

@ -345,11 +345,11 @@ CHECK_HDF5
echo echo
echo --------------------------------------------- echo ---------------------------------------------
echo testing MED2 echo testing MED3
echo --------------------------------------------- echo ---------------------------------------------
echo echo
CHECK_MED2 CHECK_MED3
echo echo
echo --------------------------------------------- echo ---------------------------------------------
@ -435,9 +435,9 @@ echo Configure
if test "${gui_ok}" = "yes"; then 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" 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 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 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 fi
for var in $variables for var in $variables

2
src/SMESHGUI/Makefile.am
View File

@ -250,7 +250,7 @@ libSMESH_la_CPPFLAGS = \
$(BOOST_CPPFLAGS) \ $(BOOST_CPPFLAGS) \
$(CORBA_CXXFLAGS) \ $(CORBA_CXXFLAGS) \
$(CORBA_INCLUDES) \ $(CORBA_INCLUDES) \
$(MED2_INCLUDES) \ $(MED3_INCLUDES) \
$(HDF5_INCLUDES) \ $(HDF5_INCLUDES) \
-I$(srcdir)/../OBJECT \ -I$(srcdir)/../OBJECT \
-I$(srcdir)/../SMESHFiltersSelection \ -I$(srcdir)/../SMESHFiltersSelection \

4
src/Tools/MeshCut/Makefile.am
View File

@ -38,9 +38,9 @@ MeshCut_SOURCES = \
MeshCut_Cas.cxx \ MeshCut_Cas.cxx \
MeshCut_DC.cxx MeshCut_DC.cxx
MeshCut_CPPFLAGS = $(MED2_INCLUDES) MeshCut_CPPFLAGS = $(MED3_INCLUDES)
MeshCut_LDFLAGS = $(MED2_LIBS) $(HDF5_LIBS) MeshCut_LDFLAGS = $(MED3_LIBS) $(HDF5_LIBS)

2
src/Tools/padder/resources/padderexe/envPadder.sh.in
View File

@ -2,7 +2,7 @@
# This script defines the shell extension required for executing the # This script defines the shell extension required for executing the
# padder executable program on the localhost (for test purposes) # padder executable program on the localhost (for test purposes)
MED_ROOT="@MED2HOME@" MED_ROOT="@MED3HOME@"
HDF_ROOT="@HDF5HOME@" HDF_ROOT="@HDF5HOME@"
CGAL_ROOT="/usr" CGAL_ROOT="/usr"
export LD_LIBRARY_PATH="$MED_ROOT/lib:$HDF_ROOT/lib:$CGAL_ROOT/lib:$LD_LIBRARY_PATH" export LD_LIBRARY_PATH="$MED_ROOT/lib:$HDF_ROOT/lib:$CGAL_ROOT/lib:$LD_LIBRARY_PATH"