ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-11-14 17:48:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Small correction for configure procedure: OpenCV is optional product

Browse Source
This commit is contained in:
vsr 2012-05-12 11:32:20 +00:00
parent 579eb263fe
commit 7872d6860c
2 changed files with 65 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
adm_local/unix/config_files/check_OpenCV.m4
View File

@ -81,7 +81,7 @@ fi
if test "x$opencv_ok" == xno ; then if test "x$opencv_ok" == xno ; then
AC_MSG_RESULT([for OPENCV: no]) AC_MSG_RESULT([for OPENCV: no])
AC_MSG_WARN([OPENCV includes or libraries are not found or are not properly installed]) AC_MSG_WARN([OPENCV includes or libraries are not found or are not properly installed])
AC_MSG_WARN([Cannot build without OPENCV. Use --with-opencv option to define OPENCV installation.]) AC_MSG_WARN([Use --with-opencv option to define OPENCV installation.])
else else
OPENCV_INCLUDES=$LOCAL_INCLUDES OPENCV_INCLUDES=$LOCAL_INCLUDES
OPENCV_LIBS=$LOCAL_LIBS OPENCV_LIBS=$LOCAL_LIBS

75
configure.ac
View File

@ -358,24 +358,77 @@ echo Summary
echo --------------------------------------------- echo ---------------------------------------------
echo echo
echo Configure if test "${SalomeGUI_need}" == "no"; then
echo "* Configuration options (without GUI):"
if test "${gui_ok}" = "yes"; then
variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok omniORB_ok boost_ok occ_ok doxygen_ok graphviz_ok sphinx_ok opencv_ok Kernel_ok gui_ok"
elif test "${SalomeGUI_need}" != "no"; then
variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok vtk_ok hdf5_ok omniORB_ok boost_ok occ_ok doxygen_ok graphviz_ok opencv_ok Kernel_ok gui_ok"
else else
variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok vtk_ok hdf5_ok omniORB_ok boost_ok occ_ok doxygen_ok graphviz_ok opencv_ok Kernel_ok" echo "* Configuration options:"
fi
echo
obligatory_vars="cc_ok lex_yacc_ok python_ok swig_ok threads_ok vtk_ok hdf5_ok omniORB_ok boost_ok occ_ok doxygen_ok graphviz_ok sphinx_ok Kernel_ok"
optional_vars="opencv_ok"
gui_vars="OpenGL_ok qt_ok"
###
# mandatory products
###
echo "--- Mandatory products:"
missing_obligatory=no
for var in $obligatory_vars
do
eval toto=\$$var
if test x$toto == "x"; then toto="no" ; fi
if test x$toto == "xno"; then missing_obligatory=yes ; fi
printf " %10s : " `echo \$var | sed -e "s,_ok,,"`
eval echo \$$var
#fi
done
if test x$missing_obligatory == "xyes"; then
AC_MSG_ERROR([one or more obligatory product is missing])
fi fi
for var in $variables ###
# gui products
###
if test "${SalomeGUI_need}" == "yes"; then
# SALOME GUI is mandatory
if test "${gui_ok}" != "yes"; then
AC_MSG_ERROR([SALOME GUI is missing])
fi
fi
if test "${SalomeGUI_need}" != "no"; then
echo "--- GUI products (optional):"
for var in $gui_vars
do
eval toto=\$$var
if test x$toto == "x"; then toto="no"; fi
printf " %10s : " `echo \$var | sed -e "s,_ok,,"`
eval echo \$toto
done
fi
###
# optional products
###
echo "--- Other products (optional):"
for var in $optional_vars
do do
printf " %10s : " `echo \$var | sed -e "s,_ok,,"` eval toto=\$$var
eval echo \$$var if test x$toto != "x"; then
printf " %10s : " `echo \$var | sed -e "s,_ok,,"`
eval echo \$$var
fi
done done
echo echo
echo "Default ORB : $DEFAULT_ORB" echo "* Default ORB : $DEFAULT_ORB"
echo echo
dnl We don t need to say when we re entering directories if we re using dnl We don t need to say when we re entering directories if we re using