ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-05-30 12:27:50 +05:00
Code Issues Packages Projects Releases Wiki Activity

Join modifications for CCRT by Jean Rahuel.

Browse Source
This commit is contained in:
jfa 2007-06-04 12:54:49 +00:00
parent d9f6d20b81
commit 7749511692
4 changed files with 83 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
adm_local/unix/make_commence.in
View File

@ -266,6 +266,7 @@ ac_cxx_partial_specialization.m4 python.m4 \
ac_cxx_typename.m4 check_pthreads.m4 check_cas.m4 \ ac_cxx_typename.m4 check_pthreads.m4 check_cas.m4 \
ac_cc_warnings.m4 check_swig.m4 ac_cc_warnings.m4 check_swig.m4
ifeq ($(GEOM_WITH_GUI),yes)
ACLOCAL_GUI = \ ACLOCAL_GUI = \
check_vtk.m4 check_opengl.m4 check_qt.m4 \ check_vtk.m4 check_opengl.m4 check_qt.m4 \
check_GUI.m4 check_corba_in_GUI.m4 check_GUI.m4 check_corba_in_GUI.m4
@ -274,3 +275,11 @@ $(top_srcdir)/aclocal.m4: $(ACLOCAL_KERNEL:%=@KERNEL_ROOT_DIR@/salome_adm/unix/c
$(ACLOCAL_GUI:%=@GUI_ROOT_DIR@/adm_local/unix/config_files/%) $(ACLOCAL_GUI:%=@GUI_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 @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
endif
ifeq ($(GEOM_WITH_GUI),no)
ACLOCAL_GUI = check_qt.m4
$(top_srcdir)/aclocal.m4: $(ACLOCAL_KERNEL:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) \
cd $(top_srcdir) ; aclocal -I adm_local/unix/config_files -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files
endif

29
build_configure
View File

@ -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,^$,.,"`
GEOM_WITH_GUI="yes"
######################################################################## ########################################################################
# Test if the KERNEL_ROOT_DIR is set correctly # Test if the KERNEL_ROOT_DIR is set correctly
@ -25,11 +26,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)
GEOM_WITH_GUI="yes"
break;;
-without-ihm | --without-ihm | -with-ihm=no | --with-ihm=no)
GEOM_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 ${GEOM_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
######################################################################## ########################################################################
@ -209,8 +225,15 @@ else
echo -n "Creating 'configure' script ... " echo -n "Creating 'configure' script ... "
fi fi
if test ${GEOM_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
fi
if test ${GEOM_WITH_GUI} = no; then
aclocal -I adm_local/unix/config_files -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files
fi
if autoconf if autoconf
then then
echo "done" echo "done"

68
configure.in.base
View File

@ -120,6 +120,14 @@ dnl
AC_CXX_HAVE_SSTREAM AC_CXX_HAVE_SSTREAM
dnl
dnl ---------------------------------------------
dnl testing WITHIHM
dnl ---------------------------------------------
dnl
CHECK_WITHIHM
dnl dnl
dnl --------------------------------------------- dnl ---------------------------------------------
dnl testing MPICH dnl testing MPICH
@ -200,13 +208,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 ---------------------------------------------
@ -224,13 +234,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 ---------------------------------------------
@ -264,24 +276,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 GEOM module necessary full GUI !" echo "failed : For configure GEOM module necessary full GUI !"
exit exit
fi
fi fi
echo echo

8
src/Makefile.in
View File

@ -32,6 +32,12 @@ VPATH=.:@srcdir@
@COMMENCE@ @COMMENCE@
SUBDIRS = OBJECT ARCHIMEDE NMTDS NMTTools NMTAlgo GEOMAlgo SKETCHER GEOM BREPExport BREPImport IGESExport IGESImport STEPExport STEPImport ShHealOper GEOMImpl GEOM_I GEOMClient DlgRef GEOMFiltersSelection GEOMGUI GEOMBase GEOMToolsGUI DisplayGUI BasicGUI PrimitiveGUI GenerationGUI EntityGUI BuildGUI BooleanGUI TransformationGUI OperationGUI RepairGUI MeasureGUI GroupGUI BlocksGUI GEOM_I_Superv GEOM_SWIG STLExport #SUBDIRS = OBJECT ARCHIMEDE NMTDS NMTTools NMTAlgo GEOMAlgo SKETCHER GEOM BREPExport BREPImport IGESExport IGESImport STEPExport STEPImport ShHealOper GEOMImpl GEOM_I GEOMClient DlgRef GEOMFiltersSelection GEOMGUI GEOMBase GEOMToolsGUI DisplayGUI BasicGUI PrimitiveGUI GenerationGUI EntityGUI BuildGUI BooleanGUI TransformationGUI OperationGUI RepairGUI MeasureGUI GroupGUI BlocksGUI GEOM_I_Superv GEOM_SWIG STLExport
SUBDIRS = ARCHIMEDE NMTDS NMTTools NMTAlgo GEOMAlgo SKETCHER GEOM BREPExport BREPImport IGESExport IGESImport STEPExport STEPImport ShHealOper GEOMImpl GEOM_I GEOMClient GEOM_I_Superv GEOM_SWIG STLExport
ifeq (@WITHIHM@,yes)
SUBDIRS+= OBJECT DlgRef GEOMFiltersSelection GEOMGUI GEOMBase GEOMToolsGUI DisplayGUI BasicGUI PrimitiveGUI GenerationGUI EntityGUI BuildGUI BooleanGUI TransformationGUI OperationGUI RepairGUI MeasureGUI GroupGUI BlocksGUI GEOM_SWIG_WITHIHM
endif
@MODULE@ @MODULE@