Join modifications for CCRT by Jean Rahuel.
This commit is contained in:
parent
d38a69aaf9
commit
efeb59f024
@ -280,20 +280,32 @@ ac_cc_warnings.m4 check_swig.m4 check_boost.m4
|
|||||||
# ACLOCAL_SRC += check_Netgen.m4
|
# ACLOCAL_SRC += check_Netgen.m4
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
ACLOCAL_GUI = \
|
|
||||||
check_vtk.m4 check_opengl.m4 check_qt.m4 \
|
|
||||||
check_GUI.m4 check_corba_in_GUI.m4
|
|
||||||
|
|
||||||
ACLOCAL_GEOM = check_GEOM.m4
|
ACLOCAL_GEOM = check_GEOM.m4
|
||||||
|
|
||||||
ACLOCAL_SMESH = check_SMESH.m4
|
ACLOCAL_SMESH = check_SMESH.m4
|
||||||
|
|
||||||
|
ifeq ($(NETGENPLUGIN_WITH_GUI),yes)
|
||||||
|
ACLOCAL_GUI = \
|
||||||
|
check_vtk.m4 check_opengl.m4 check_qt.m4 \
|
||||||
|
check_GUI.m4 check_corba_in_GUI.m4
|
||||||
|
|
||||||
$(top_srcdir)/aclocal.m4: $(ACLOCAL_KERNEL%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) \
|
$(top_srcdir)/aclocal.m4: $(ACLOCAL_KERNEL%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) \
|
||||||
$(ACLOCAL_GUI:%=@GUI_ROOT_DIR@/adm_local/unix/config_files/%) \
|
$(ACLOCAL_GUI:%=@GUI_ROOT_DIR@/adm_local/unix/config_files/%) \
|
||||||
$(ACLOCAL_GEOM:%=@GEOM_ROOT_DIR@/adm_local/unix/config_files/%) \
|
$(ACLOCAL_GEOM:%=@GEOM_ROOT_DIR@/adm_local/unix/config_files/%) \
|
||||||
$(ACLOCAL_SMESH:%=@SMESH_ROOT_DIR@/adm_local/unix/config_files/%)
|
$(ACLOCAL_SMESH:%=@SMESH_ROOT_DIR@/adm_local/unix/config_files/%)
|
||||||
cd $(top_srcdir) ; aclocal -I adm_local/unix/config_files -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files \
|
cd $(top_srcdir) ; aclocal -I adm_local/unix/config_files \
|
||||||
-I @GUI_ROOT_DIR@/adm_local/unix/config_files \
|
-I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files \
|
||||||
-I @GEOM_ROOT_DIR@/adm_local/unix/config_files \
|
-I @GUI_ROOT_DIR@/adm_local/unix/config_files \
|
||||||
-I @SMESH_ROOT_DIR@/adm_local/unix/config_files
|
-I @GEOM_ROOT_DIR@/adm_local/unix/config_files \
|
||||||
|
-I @SMESH_ROOT_DIR@/adm_local/unix/config_files
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq ($(NETGENPLUGIN_WITH_GUI),no)
|
||||||
|
$(top_srcdir)/aclocal.m4: $(ACLOCAL_KERNEL%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) \
|
||||||
|
$(ACLOCAL_GEOM:%=@GEOM_ROOT_DIR@/adm_local/unix/config_files/%) \
|
||||||
|
$(ACLOCAL_SMESH:%=@SMESH_ROOT_DIR@/adm_local/unix/config_files/%)
|
||||||
|
cd $(top_srcdir) ; aclocal -I adm_local/unix/config_files \
|
||||||
|
-I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files \
|
||||||
|
-I @GEOM_ROOT_DIR@/adm_local/unix/config_files \
|
||||||
|
-I @SMESH_ROOT_DIR@/adm_local/unix/config_files
|
||||||
|
endif
|
||||||
|
@ -11,6 +11,7 @@
|
|||||||
|
|
||||||
ORIG_DIR=`pwd`
|
ORIG_DIR=`pwd`
|
||||||
CONF_DIR=`echo $0 | sed -e "s,[^/]*$,,;s,/$,,;s,^$,.,"`
|
CONF_DIR=`echo $0 | sed -e "s,[^/]*$,,;s,/$,,;s,^$,.,"`
|
||||||
|
NETGENPLUGIN_WITH_GUI="yes"
|
||||||
|
|
||||||
########################################################################
|
########################################################################
|
||||||
# Test if the KERNEL_ROOT_DIR is set correctly
|
# Test if the KERNEL_ROOT_DIR is set correctly
|
||||||
@ -26,12 +27,26 @@ fi
|
|||||||
# echo "failed : KERNEL_SRC variable is not correct !"
|
# echo "failed : KERNEL_SRC variable is not correct !"
|
||||||
# exit
|
# exit
|
||||||
#fi
|
#fi
|
||||||
|
for option
|
||||||
|
do
|
||||||
|
case $option in
|
||||||
|
-with-ihm | --with-ihm)
|
||||||
|
NETGENPLUGIN_WITH_GUI="yes"
|
||||||
|
break;;
|
||||||
|
-without-ihm | --without-ihm | -with-ihm=no | --with-ihm=no)
|
||||||
|
NETGENPLUGIN_WITH_GUI="no"
|
||||||
|
break;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
########################################################################
|
########################################################################
|
||||||
# Test if the GUI_ROOT_DIR is set correctly
|
# Test if the GUI_ROOT_DIR is set correctly
|
||||||
|
|
||||||
if test ! -d "${GUI_ROOT_DIR}"; then
|
if test ${NETGENPLUGIN_WITH_GUI} = yes; then
|
||||||
echo "failed : GUI_ROOT_DIR variable is not correct !"
|
if test ! -d "${GUI_ROOT_DIR}"; then
|
||||||
exit
|
echo "failed : GUI_ROOT_DIR variable is not correct !"
|
||||||
|
exit
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
########################################################################
|
########################################################################
|
||||||
@ -235,11 +250,21 @@ else
|
|||||||
echo -n "Creating 'configure' script ... "
|
echo -n "Creating 'configure' script ... "
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if test ${NETGENPLUGIN_WITH_GUI} = yes; then
|
||||||
aclocal -I adm_local/unix/config_files -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \
|
aclocal -I adm_local/unix/config_files -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \
|
||||||
-I ${GUI_ROOT_DIR}/adm_local/unix/config_files \
|
-I ${GUI_ROOT_DIR}/adm_local/unix/config_files \
|
||||||
-I ${MED_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 \
|
-I ${GEOM_ROOT_DIR}/adm_local/unix/config_files \
|
||||||
-I ${SMESH_ROOT_DIR}/adm_local/unix/config_files
|
-I ${SMESH_ROOT_DIR}/adm_local/unix/config_files
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test ${NETGENPLUGIN_WITH_GUI} = no; then
|
||||||
|
aclocal -I adm_local/unix/config_files -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \
|
||||||
|
-I ${MED_ROOT_DIR}/adm_local/unix/config_files \
|
||||||
|
-I ${GEOM_ROOT_DIR}/adm_local/unix/config_files \
|
||||||
|
-I ${SMESH_ROOT_DIR}/adm_local/unix/config_files
|
||||||
|
fi
|
||||||
|
|
||||||
if autoconf
|
if autoconf
|
||||||
then
|
then
|
||||||
echo "done"
|
echo "done"
|
||||||
|
@ -144,6 +144,14 @@ echo
|
|||||||
|
|
||||||
CHECK_BOOST
|
CHECK_BOOST
|
||||||
|
|
||||||
|
dnl
|
||||||
|
dnl ---------------------------------------------
|
||||||
|
dnl testing WITHIHM
|
||||||
|
dnl ---------------------------------------------
|
||||||
|
dnl
|
||||||
|
|
||||||
|
CHECK_WITHIHM
|
||||||
|
|
||||||
dnl
|
dnl
|
||||||
dnl ---------------------------------------------
|
dnl ---------------------------------------------
|
||||||
dnl testing MPICH
|
dnl testing MPICH
|
||||||
@ -224,13 +232,15 @@ AC_SUBST_FILE(CORBA)
|
|||||||
corba=make_$ORB
|
corba=make_$ORB
|
||||||
CORBA=adm_local/unix/$corba
|
CORBA=adm_local/unix/$corba
|
||||||
|
|
||||||
echo
|
if test "X$WITHIHM" = "Xyes"; then
|
||||||
echo ---------------------------------------------
|
echo
|
||||||
echo testing openGL
|
echo ---------------------------------------------
|
||||||
echo ---------------------------------------------
|
echo testing openGL
|
||||||
echo
|
echo ---------------------------------------------
|
||||||
|
echo
|
||||||
|
|
||||||
CHECK_OPENGL
|
CHECK_OPENGL
|
||||||
|
fi
|
||||||
|
|
||||||
echo
|
echo
|
||||||
echo ---------------------------------------------
|
echo ---------------------------------------------
|
||||||
@ -248,13 +258,15 @@ echo
|
|||||||
|
|
||||||
CHECK_MSG2QM
|
CHECK_MSG2QM
|
||||||
|
|
||||||
echo
|
if test "X$WITHIHM" = "Xyes"; then
|
||||||
echo ---------------------------------------------
|
echo
|
||||||
echo testing VTK
|
echo ---------------------------------------------
|
||||||
echo ---------------------------------------------
|
echo testing VTK
|
||||||
echo
|
echo ---------------------------------------------
|
||||||
|
echo
|
||||||
|
|
||||||
CHECK_VTK
|
CHECK_VTK
|
||||||
|
fi
|
||||||
|
|
||||||
echo
|
echo
|
||||||
echo ---------------------------------------------
|
echo ---------------------------------------------
|
||||||
@ -280,24 +292,26 @@ echo
|
|||||||
|
|
||||||
CHECK_HTML_GENERATORS
|
CHECK_HTML_GENERATORS
|
||||||
|
|
||||||
echo
|
if test "X$WITHIHM" = "Xyes"; then
|
||||||
echo ---------------------------------------------
|
echo
|
||||||
echo Testing GUI
|
echo ---------------------------------------------
|
||||||
echo ---------------------------------------------
|
echo Testing GUI
|
||||||
echo
|
echo ---------------------------------------------
|
||||||
|
echo
|
||||||
|
|
||||||
CHECK_SALOME_GUI
|
CHECK_SALOME_GUI
|
||||||
|
|
||||||
echo
|
echo
|
||||||
echo ---------------------------------------------
|
echo ---------------------------------------------
|
||||||
echo Testing full GUI
|
echo Testing full GUI
|
||||||
echo ---------------------------------------------
|
echo ---------------------------------------------
|
||||||
echo
|
echo
|
||||||
|
|
||||||
CHECK_CORBA_IN_GUI
|
CHECK_CORBA_IN_GUI
|
||||||
if test "x${CORBA_IN_GUI}" != "xyes"; then
|
if test "x${CORBA_IN_GUI}" != "xyes"; then
|
||||||
echo "failed : For configure NETGENPLUGIN module necessary full GUI !"
|
echo "failed : For configure NETGENPLUGIN module necessary full GUI !"
|
||||||
exit
|
exit
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo
|
echo
|
||||||
|
@ -31,6 +31,12 @@ VPATH=.:@srcdir@
|
|||||||
|
|
||||||
@COMMENCE@
|
@COMMENCE@
|
||||||
|
|
||||||
SUBDIRS = NETGEN NETGENPlugin GUI
|
#SUBDIRS = NETGEN NETGENPlugin GUI
|
||||||
|
|
||||||
|
SUBDIRS = NETGEN NETGENPlugin
|
||||||
|
|
||||||
|
ifeq (@WITHIHM@,yes)
|
||||||
|
SUBDIRS += GUI
|
||||||
|
endif
|
||||||
|
|
||||||
@MODULE@
|
@MODULE@
|
||||||
|
Loading…
x
Reference in New Issue
Block a user