From ddf779fec483a14a6601150fc923c01e6bf8acdb Mon Sep 17 00:00:00 2001 From: vsr Date: Sat, 4 Feb 2012 17:10:30 +0000 Subject: [PATCH] Remove useless opencv staff --- configure.ac | 4 ++-- src/LightApp/Makefile.am | 4 +--- src/SOCC/Makefile.am | 4 +--- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index de14df6cf..4ae6cc1ad 100644 --- a/configure.ac +++ b/configure.ac @@ -526,10 +526,10 @@ fi if test "$GUI_DISABLE_CORBA" != "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 sip_ok pyqt_ok qwt_ok doxygen_ok graphviz_ok opencv_ok libxml_ok Kernel_ok" +omniORB_ok boost_ok occ_ok sip_ok pyqt_ok qwt_ok doxygen_ok graphviz_ok libxml_ok Kernel_ok" else variables="cc_ok lex_yacc_ok python_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok boost_ok -occ_ok sip_ok pyqt_ok qwt_ok doxygen_ok graphviz_ok opencv_ok Kernel_ok " +occ_ok sip_ok pyqt_ok qwt_ok doxygen_ok graphviz_ok Kernel_ok " fi for var in $variables diff --git a/src/LightApp/Makefile.am b/src/LightApp/Makefile.am index 1f032bed8..26e183815 100755 --- a/src/LightApp/Makefile.am +++ b/src/LightApp/Makefile.am @@ -183,13 +183,11 @@ nodist_salomeres_DATA = \ libLightApp_la_CPPFLAGS = $(PYTHON_INCLUDES) $(QT_INCLUDES) $(CAS_CPPFLAGS) \ $(HDF5_INCLUDES) @KERNEL_CXXFLAGS@ -I$(srcdir)/../SUIT -I$(srcdir)/../STD \ - $(OPENCV_INCLUDES) \ -I$(srcdir)/../CAM -I$(srcdir)/../ObjBrowser -I$(srcdir)/../LogWindow \ -I$(srcdir)/../Prs -I$(srcdir)/../Qtx -I$(srcdir)/../Event -I$(srcdir)/../Style \ -I$(srcdir)/../CASCatch -libLightApp_la_LDFLAGS = $(QT_MT_LIBS) \ - $(OPENCV_LIBS) +libLightApp_la_LDFLAGS = $(QT_MT_LIBS) if ENABLE_VTKVIEWER libLightApp_la_CPPFLAGS += $(VTK_INCLUDES) -I$(srcdir)/../VTKViewer diff --git a/src/SOCC/Makefile.am b/src/SOCC/Makefile.am index 6f9ba3e5d..bd8578cfc 100755 --- a/src/SOCC/Makefile.am +++ b/src/SOCC/Makefile.am @@ -46,12 +46,10 @@ MOC_FILES = \ nodist_libSOCC_la_SOURCES = $(MOC_FILES) libSOCC_la_CPPFLAGS = $(QT_INCLUDES) $(CAS_CPPFLAGS) $(BOOST_CPPFLAGS) \ - $(OPENCV_INCLUDES) \ -I$(srcdir)/../SUIT -I$(srcdir)/../OBJECT -I$(srcdir)/../Prs \ -I$(srcdir)/../OCCViewer -I$(srcdir)/../Qtx -libSOCC_la_LDFLAGS = $(QT_MT_LIBS) \ - $(OPENCV_LIBS) +libSOCC_la_LDFLAGS = $(QT_MT_LIBS) libSOCC_la_LIBADD = ../Qtx/libqtx.la ../SUIT/libsuit.la ../OBJECT/libSalomeObject.la \ ../Prs/libSalomePrs.la ../OCCViewer/libOCCViewer.la -- 2.39.2