Salome HOME
projects
/
modules
/
geom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from BR_OPENCV
[modules/geom.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 8be0b6c5389074871cfd16f27b0e229b6120bd9c..8849337c387421d0f8a65afdd6df5de29b8fdeea 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-331,6
+331,14
@@
echo ---------------------------------------------
echo
CHECK_SPHINX
echo
CHECK_SPHINX
+echo
+echo ---------------------------------------------
+echo testing Opencv
+echo ---------------------------------------------
+echo
+CHECK_OPENCV
+AC_DEFINE_UNQUOTED(WITH_OPENCV,${WITH_OPENCV})
+
echo
echo ---------------------------------------------
echo Testing Kernel
echo
echo ---------------------------------------------
echo Testing Kernel
@@
-348,11
+356,11
@@
echo
echo Configure
if test "${gui_ok}" = "yes"; then
echo Configure
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 Kernel_ok gui_ok"
+ 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
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 Kernel_ok gui_ok"
+ 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 Kernel_ok"
+ 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"
fi
for var in $variables
fi
for var in $variables
@@
-463,6
+471,7
@@
AC_OUTPUT([ \
src/STEPImport/Makefile \
src/STLExport/Makefile \
src/ShHealOper/Makefile \
src/STEPImport/Makefile \
src/STLExport/Makefile \
src/ShHealOper/Makefile \
+ src/ShapeRecognition/Makefile \
src/TransformationGUI/Makefile \
src/VTKExport/Makefile \
resources/Makefile \
src/TransformationGUI/Makefile \
src/VTKExport/Makefile \
resources/Makefile \