From 4f1eb2eff8b9215a2b86d4a635112cea5c5fdf9a Mon Sep 17 00:00:00 2001 From: eap Date: Thu, 17 Apr 2008 07:58:10 +0000 Subject: [PATCH] provide GHS3DPLUGIN_WITH_GUI option --- build_configure | 45 +++++++++++++++-- configure.ac | 128 ++++++++++++++++++++++++++---------------------- 2 files changed, 110 insertions(+), 63 deletions(-) diff --git a/build_configure b/build_configure index 5c6eb44..9619d3a 100755 --- a/build_configure +++ b/build_configure @@ -11,6 +11,19 @@ ORIG_DIR=`pwd` CONF_DIR=`echo $0 | sed -e "s,[^/]*$,,;s,/$,,;s,^$,.,"` +GHS3DPLUGIN_WITH_GUI="yes" + +for option +do + case $option in + -with-ihm | --with-ihm) + GHS3DPLUGIN_WITH_GUI="yes" + break;; + -without-ihm | --without-ihm | -with-ihm=no | --with-ihm=no) + GHS3DPLUGIN_WITH_GUI="no" + break;; + esac +done ######################################################################## # Test if the KERNEL_ROOT_DIR is set correctly @@ -43,6 +56,14 @@ if test ! -d "${GEOM_ROOT_DIR}"; then exit fi +######################################################################## +# Test if the MED_ROOT_DIR is set correctly + +if test ! -d "${MED_ROOT_DIR}"; then + echo "failed : MED_ROOT_DIR variable is not correct !" + exit +fi + ######################################################################## # Test if the SMESH_ROOT_DIR is set correctly @@ -54,6 +75,11 @@ fi cd ${CONF_DIR} ABS_CONF_DIR=`pwd` +####################################################################### +# Update configure.ac script: to set GHS3DPLUGIN_WITH_GUI variable +sed -e s/GHS3DPLUGIN_WITH_GUI=[a-z]*/GHS3DPLUGIN_WITH_GUI=${GHS3DPLUGIN_WITH_GUI}/g configure.ac > configure.tmp +mv -f configure.tmp configure.ac + mkdir -p salome_adm/unix/config_files #cp -f ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files/* salome_adm/unix/config_files #cp -f ${KERNEL_ROOT_DIR}/salome_adm/unix/pythonbe.py salome_adm/unix @@ -82,11 +108,20 @@ cp -f ${KERNEL_ROOT_DIR}/salome_adm/unix/SALOMEconfig.h.in salome_adm/unix # autom4te.cache (directory) echo "====================================================== aclocal" -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 ${GEOM_ROOT_DIR}/adm_local/unix/config_files \ - -I ${SMESH_ROOT_DIR}/adm_local/unix/config_files || exit 1 +if test ${GHS3DPLUGIN_WITH_GUI} = yes; then + 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 ${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 || exit 1 +else + 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 || exit 1 +fi # ____________________________________________________________________ # libtoolize creates some configuration files (ltmain.sh, diff --git a/configure.ac b/configure.ac index 4564817..8591cc2 100644 --- a/configure.ac +++ b/configure.ac @@ -206,29 +206,63 @@ AC_SUBST_FILE(CORBA) corba=make_$ORB CORBA=adm_local/unix/$corba -echo -echo --------------------------------------------- -echo testing openGL -echo --------------------------------------------- -echo - -CHECK_OPENGL - -echo -echo --------------------------------------------- -echo testing MSG2QM -echo --------------------------------------------- -echo - -CHECK_MSG2QM - -echo -echo --------------------------------------------- -echo testing VTK -echo --------------------------------------------- -echo - -CHECK_VTK +GHS3DPLUGIN_WITH_GUI=yes + +AM_CONDITIONAL(GHS3DPLUGIN_ENABLE_GUI, [test "${GHS3DPLUGIN_WITH_GUI}" = "yes"]) + +if test "${GHS3DPLUGIN_WITH_GUI}" = "yes"; then + echo + echo --------------------------------------------- + echo testing MSG2QM + echo --------------------------------------------- + echo + + CHECK_MSG2QM + + echo + echo --------------------------------------------- + echo testing openGL + echo --------------------------------------------- + echo + + CHECK_OPENGL + + echo + echo --------------------------------------------- + echo testing QT + echo --------------------------------------------- + echo + + CHECK_QT + + echo + echo --------------------------------------------- + echo testing VTK + echo --------------------------------------------- + echo + + CHECK_VTK + + echo + echo --------------------------------------------- + echo Testing GUI + echo --------------------------------------------- + echo + + CHECK_SALOME_GUI + + echo + echo --------------------------------------------- + echo Testing full GUI + echo --------------------------------------------- + echo + + CHECK_CORBA_IN_GUI + if test "x${CORBA_IN_GUI}" != "xyes"; then + echo "failed : For configure GHS3DPLUGIN module necessary full GUI !" + exit + fi +fi echo echo --------------------------------------------- @@ -264,56 +298,28 @@ CHECK_HTML_GENERATORS echo echo --------------------------------------------- -echo Testing GUI -echo --------------------------------------------- -echo - -CHECK_SALOME_GUI - -echo -echo --------------------------------------------- -echo Testing full GUI +echo Testing Kernel echo --------------------------------------------- echo -CHECK_CORBA_IN_GUI -if test "x${CORBA_IN_GUI}" != "xyes"; then - echo "failed : For configure CALCULATOR module necessary full GUI !" - exit -fi +CHECK_KERNEL echo echo --------------------------------------------- -echo Testing Kernel +echo Testing Geom echo --------------------------------------------- echo -CHECK_KERNEL +CHECK_GEOM echo echo --------------------------------------------- -echo Testing Geom +echo Testing Med echo --------------------------------------------- echo -CHECK_GEOM +CHECK_MED -# echo -# echo --------------------------------------------- -# echo Testing Med -# echo --------------------------------------------- -# echo -# -# CHECK_MED -# -# echo -# echo --------------------------------------------- -# echo Testing Netgen -# echo --------------------------------------------- -# echo -# -# CHECK_NETGEN -# echo echo --------------------------------------------- echo Testing SMesh @@ -337,7 +343,12 @@ echo --------------------------------------------- echo echo Configure -variables="cc_ok boost_ok threads_ok omniORB_ok occ_ok doxygen_ok Kernel_ok Geom_ok SMesh_ok GHS3D_ok" +if test "${GHS3DPLUGIN_WITH_GUI}" = "yes"; then +variables="cc_ok boost_ok threads_ok omniORB_ok occ_ok doxygen_ok Kernel_ok Geom_ok Med_ok SMesh_ok GHS3D_ok OpenGL_ok qt_ok vtk_ok " +fi +if test "${GHS3DPLUGIN_WITH_GUI}" = "no"; then +variables="cc_ok boost_ok threads_ok omniORB_ok occ_ok doxygen_ok Kernel_ok Geom_ok Med_ok SMesh_ok GHS3D_ok" +fi for var in $variables do printf " %10s : " `echo \$var | sed -e "s,_ok,,"` @@ -378,6 +389,7 @@ AC_OUTPUT([ \ ./bin/Makefile \ ./GHS3DPLUGIN_version.h \ ./src/Makefile \ + ./src/GUI/Makefile \ ./resources/Makefile \ ./idl/Makefile \ Makefile \ -- 2.39.2