mirror of
https://git.salome-platform.org/gitpub/modules/smesh.git
synced 2025-02-15 13:53:08 +05:00
Change configuration
This commit is contained in:
parent
bbeefba922
commit
294a0d4691
@ -14,7 +14,7 @@ VPATH=.:@srcdir@:@top_srcdir@/bin:@top_srcdir@/resources:./bin:@top_srcdir@/idl
|
||||
|
||||
@COMMENCE@
|
||||
|
||||
SUBDIRS = idl src doc
|
||||
SUBDIRS = idl src doc adm_local
|
||||
|
||||
RESOURCES_FILES = \
|
||||
delete.png \
|
||||
|
@ -1,45 +0,0 @@
|
||||
# Check availability of Geom binary distribution
|
||||
#
|
||||
# Author : Nicolas REJNERI (OPEN CASCADE, 2003)
|
||||
#
|
||||
|
||||
AC_DEFUN([CHECK_GEOM],[
|
||||
|
||||
AC_CHECKING(for Geom)
|
||||
|
||||
Geom_ok=no
|
||||
|
||||
AC_ARG_WITH(geom,
|
||||
[ --with-geom=DIR root directory path of GEOM installation ],
|
||||
GEOM_DIR="$withval",GEOM_DIR="")
|
||||
|
||||
if test "x$GEOM_DIR" == "x" ; then
|
||||
|
||||
# no --with-geom-dir option used
|
||||
|
||||
if test "x$GEOM_ROOT_DIR" != "x" ; then
|
||||
|
||||
# GEOM_ROOT_DIR environment variable defined
|
||||
GEOM_DIR=$GEOM_ROOT_DIR
|
||||
|
||||
fi
|
||||
#
|
||||
fi
|
||||
|
||||
if test -f ${GEOM_DIR}/lib/salome/libGEOMClient.so ; then
|
||||
Geom_ok=yes
|
||||
AC_MSG_RESULT(Using Geom module distribution in ${GEOM_DIR})
|
||||
|
||||
if test "x$GEOM_ROOT_DIR" == "x" ; then
|
||||
GEOM_ROOT_DIR=${GEOM_DIR}
|
||||
fi
|
||||
AC_SUBST(GEOM_ROOT_DIR)
|
||||
|
||||
else
|
||||
AC_MSG_WARN("Cannot find compiled Geom module distribution")
|
||||
fi
|
||||
|
||||
AC_MSG_RESULT(for Geom: $Geom_ok)
|
||||
|
||||
])dnl
|
||||
|
@ -1,45 +0,0 @@
|
||||
# Check availability of Med binary distribution
|
||||
#
|
||||
# Author : Nicolas REJNERI (OPEN CASCADE, 2003)
|
||||
#
|
||||
|
||||
AC_DEFUN([CHECK_MED],[
|
||||
|
||||
AC_CHECKING(for Med)
|
||||
|
||||
Med_ok=no
|
||||
|
||||
AC_ARG_WITH(med,
|
||||
[ --with-med=DIR root directory path of MED installation ],
|
||||
MED_DIR="$withval",MED_DIR="")
|
||||
|
||||
if test "x$MED_DIR" == "x" ; then
|
||||
|
||||
# no --with-med-dir option used
|
||||
|
||||
if test "x$MED_ROOT_DIR" != "x" ; then
|
||||
|
||||
# MED_ROOT_DIR environment variable defined
|
||||
MED_DIR=$MED_ROOT_DIR
|
||||
|
||||
fi
|
||||
#
|
||||
fi
|
||||
|
||||
if test -f ${MED_DIR}/idl/salome/MED.idl ; then
|
||||
Med_ok=yes
|
||||
AC_MSG_RESULT(Using Med module distribution in ${MED_DIR})
|
||||
|
||||
if test "x$MED_ROOT_DIR" == "x" ; then
|
||||
MED_ROOT_DIR=${MED_DIR}
|
||||
fi
|
||||
AC_SUBST(MED_ROOT_DIR)
|
||||
|
||||
else
|
||||
AC_MSG_WARN("Cannot find Med module sources")
|
||||
fi
|
||||
|
||||
AC_MSG_RESULT(for Med: $Med_ok)
|
||||
|
||||
])dnl
|
||||
|
54
adm_local/unix/config_files/check_SMESH.m4
Normal file
54
adm_local/unix/config_files/check_SMESH.m4
Normal file
@ -0,0 +1,54 @@
|
||||
# Check availability of SMesh binary distribution
|
||||
#
|
||||
# Author : Nicolas REJNERI (OPEN CASCADE, 2003)
|
||||
#
|
||||
|
||||
AC_DEFUN([CHECK_SMESH],[
|
||||
|
||||
AC_CHECKING(for SMesh)
|
||||
|
||||
SMesh_ok=no
|
||||
|
||||
AC_ARG_WITH(smesh,
|
||||
[ --with-smesh=DIR root directory path of SMESH installation ],
|
||||
SMESH_DIR="$withval",SMESH_DIR="")
|
||||
|
||||
if test "x$SMESH_DIR" == "x" ; then
|
||||
|
||||
# no --with-smesh option used
|
||||
|
||||
if test "x$SMESH_ROOT_DIR" != "x" ; then
|
||||
|
||||
# SMESH_ROOT_DIR environment variable defined
|
||||
SMESH_DIR=$SMESH_ROOT_DIR
|
||||
|
||||
else
|
||||
|
||||
# search SMESH binaries in PATH variable
|
||||
AC_PATH_PROG(TEMP, libSMESH_Swig.py)
|
||||
if test "x$TEMP" != "x" ; then
|
||||
SMESH_BIN_DIR=`dirname $TEMP`
|
||||
SMESH_DIR=`dirname $SMESH_BIN_DIR`
|
||||
fi
|
||||
|
||||
fi
|
||||
#
|
||||
fi
|
||||
|
||||
if test -f ${SMESH_DIR}/bin/salome/libSMESH_Swig.py ; then
|
||||
SMesh_ok=yes
|
||||
AC_MSG_RESULT(Using SMesh module distribution in ${SMESH_DIR})
|
||||
|
||||
if test "x$SMESH_ROOT_DIR" == "x" ; then
|
||||
SMESH_ROOT_DIR=${SMESH_DIR}
|
||||
fi
|
||||
AC_SUBST(SMESH_ROOT_DIR)
|
||||
|
||||
else
|
||||
AC_MSG_WARN("Cannot find compiled SMesh module distribution")
|
||||
fi
|
||||
|
||||
AC_MSG_RESULT(for SMesh: $SMesh_ok)
|
||||
|
||||
])dnl
|
||||
|
29
adm_local/unix/config_files/check_f77.m4
Normal file
29
adm_local/unix/config_files/check_f77.m4
Normal file
@ -0,0 +1,29 @@
|
||||
dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
|
||||
dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
|
||||
dnl
|
||||
dnl This library is free software; you can redistribute it and/or
|
||||
dnl modify it under the terms of the GNU Lesser General Public
|
||||
dnl License as published by the Free Software Foundation; either
|
||||
dnl version 2.1 of the License.
|
||||
dnl
|
||||
dnl This library is distributed in the hope that it will be useful,
|
||||
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
dnl Lesser General Public License for more details.
|
||||
dnl
|
||||
dnl You should have received a copy of the GNU Lesser General Public
|
||||
dnl License along with this library; if not, write to the Free Software
|
||||
dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
dnl
|
||||
dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
|
||||
dnl
|
||||
dnl
|
||||
dnl
|
||||
AC_DEFUN([CHECK_F77],[
|
||||
|
||||
AC_PROG_F77
|
||||
|
||||
AC_F77_LIBRARY_LDFLAGS
|
||||
AC_F77_WRAPPERS
|
||||
|
||||
])dnl
|
@ -240,14 +240,27 @@ $(top_srcdir)/configure.in: $(top_srcdir)/configure.in.base
|
||||
|
||||
|
||||
ACLOCAL_SRC = \
|
||||
ac_cxx_bool.m4 check_corba.m4 check_vtk.m4 \
|
||||
ac_cxx_bool.m4 check_corba.m4 \
|
||||
ac_cxx_depend_flag.m4 check_hdf5.m4 enable_pthreads.m4 \
|
||||
ac_cxx_mutable.m4 check_mico.m4 libtool.m4 \
|
||||
ac_cxx_namespaces.m4 check_omniorb.m4 pyembed.m4 \
|
||||
ac_cxx_partial_specialization.m4 check_opengl.m4 python.m4 \
|
||||
ac_cxx_partial_specialization.m4 python.m4 \
|
||||
ac_cxx_typename.m4 check_pthreads.m4 check_cas.m4 \
|
||||
ac_cc_warnings.m4 check_qt.m4 check_boost.m4 \
|
||||
check_swig.m4
|
||||
ac_cc_warnings.m4 check_boost.m4 check_swig.m4
|
||||
|
||||
$(top_srcdir)/aclocal.m4: $(ACLOCAL_SRC:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%)
|
||||
cd $(top_srcdir) ; aclocal --acdir=adm_local/unix/config_files -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files
|
||||
ACLOCAL_GUI = \
|
||||
check_vtk.m4 check_opengl.m4 check_qt.m4 \
|
||||
check_GUI.m4 check_full_GUI.m4
|
||||
|
||||
ACLOCAL_MED = check_Med.m4
|
||||
ACLOCAL_GEOM = check_GEOM.m4
|
||||
|
||||
$(top_srcdir)/aclocal.m4: $(ACLOCAL_SRC:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) \
|
||||
$(ACLOCAL_GUI:%=@GUI_ROOT_DIR@/adm_local/unix/config_files/%) \
|
||||
$(ACLOCAL_MED:%=@MED_ROOT_DIR@/adm_local/unix/config_files/%) \
|
||||
$(ACLOCAL_GEOM:%=@GEOM_ROOT_DIR@/adm_local/unix/config_files/%)
|
||||
cd $(top_srcdir) ; aclocal --acdir=adm_local/unix/config_files -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files \
|
||||
-I @GUI_ROOT_DIR@/adm_local/unix/config_files \
|
||||
-I @MED_ROOT_DIR@/adm_local/unix/config_files \
|
||||
-I @GEOM_ROOT_DIR@/adm_local/unix/config_files
|
||||
|
@ -203,7 +203,10 @@ else
|
||||
echo -n "Creating 'configure' script ... "
|
||||
fi
|
||||
|
||||
aclocal --acdir=adm_local/unix/config_files -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files
|
||||
aclocal --acdir=adm_local/unix/config_files -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \
|
||||
-I ${GUI_ROOT_DIR}/adm_local/unix/config_files \
|
||||
-I ${MED_ROOT_DIR}/adm_local/unix/config_files \
|
||||
-I ${GEOM_ROOT_DIR}/adm_local/unix/config_files
|
||||
if autoconf
|
||||
then
|
||||
echo "done"
|
||||
|
@ -265,6 +265,26 @@ echo
|
||||
|
||||
CHECK_HTML_GENERATORS
|
||||
|
||||
echo
|
||||
echo ---------------------------------------------
|
||||
echo Testing GUI
|
||||
echo ---------------------------------------------
|
||||
echo
|
||||
|
||||
CHECK_SALOME_GUI
|
||||
|
||||
echo
|
||||
echo ---------------------------------------------
|
||||
echo Testing full GUI
|
||||
echo ---------------------------------------------
|
||||
echo
|
||||
|
||||
CHECK_FULL_GUI
|
||||
if test "x${FULL_GUI}" != "xyes"; then
|
||||
echo "failed : For configure SMESH module necessary full GUI !"
|
||||
exit
|
||||
fi
|
||||
|
||||
echo
|
||||
echo ---------------------------------------------
|
||||
echo Testing Kernel
|
||||
|
Loading…
Reference in New Issue
Block a user