From: gdd <gdd>
Date: Tue, 8 Nov 2011 10:43:05 +0000 (+0000)
Subject: rnc: removed dependance of GUI to OpenCV
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=926c30d2542fb2f6c7bb0e4c733fe2a468a68161;p=modules%2Fgui.git

rnc: removed dependance of GUI to OpenCV
---

diff --git a/configure.ac b/configure.ac
index 300aa728e..98fd2a239 100644
--- a/configure.ac
+++ b/configure.ac
@@ -371,15 +371,6 @@ echo
 
 CHECK_QWT
 
-echo
-echo ---------------------------------------------
-echo Testing OpenCV
-echo ---------------------------------------------
-echo
-
-CHECK_OPENCV
-
-
 CHECK_TESTRECORDER
 
 echo
diff --git a/src/OCCViewer/Makefile.am b/src/OCCViewer/Makefile.am
index ddf35f1c7..191552c1c 100755
--- a/src/OCCViewer/Makefile.am
+++ b/src/OCCViewer/Makefile.am
@@ -25,13 +25,6 @@
 #  $Header$
 #
 
-if WITH_OPENCV
-  FeatureDetector_Header = OCCViewer_FeatureDetector.h
-  FeatureDetector_Sources = OCCViewer_FeatureDetector.cxx
-  Opencv_libs = $(OPENCV_LIBS)
-  Opencv_includes = $(OPENCV_INCLUDES)
-endif
-
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 lib_LTLIBRARIES = libOCCViewer.la
@@ -54,8 +47,7 @@ salomeinclude_HEADERS =				\
 	OCCViewer_FontWidget.h                  \
 	OCCViewer_CubeAxesDlg.h                 \
 	OCCViewer_ToolTip.h			\
-	OCCViewer_ViewFrame.h			\
-	$(FeatureDetector_Header)
+	OCCViewer_ViewFrame.h
 
 dist_libOCCViewer_la_SOURCES =			\
 	OCCViewer_AISSelector.cxx		\
@@ -74,8 +66,7 @@ dist_libOCCViewer_la_SOURCES =			\
 	OCCViewer_FontWidget.cxx                \
 	OCCViewer_CubeAxesDlg.cxx               \
 	OCCViewer_ToolTip.cxx			\
-	OCCViewer_ViewFrame.cxx			\
-	$(FeatureDetector_Sources)
+	OCCViewer_ViewFrame.cxx
 
 MOC_FILES =					\
 	OCCViewer_AISSelector_moc.cxx		\
@@ -135,11 +126,9 @@ nodist_salomeres_DATA =		\
 
 libOCCViewer_la_CPPFLAGS = $(QT_INCLUDES) $(OGL_INCLUDES) $(CAS_CPPFLAGS) @KERNEL_CXXFLAGS@ \
 	-I$(srcdir)/../SUIT -I$(srcdir)/../ViewerTools -I$(srcdir)/../Qtx \
-	-I$(srcdir)/../OpenGLUtils -I$(srcdir)/../CASCatch\
-	$(Opencv_includes)
+	-I$(srcdir)/../OpenGLUtils -I$(srcdir)/../CASCatch
 
 libOCCViewer_la_LDFLAGS  = $(OGL_LIBS) $(QT_MT_LIBS) $(CAS_KERNEL) $(CAS_VIEWER) \
-	$(Opencv_libs)
 
 libOCCViewer_la_LIBADD   = ../Qtx/libqtx.la ../SUIT/libsuit.la \
 	../ViewerTools/libViewerTools.la ../OpenGLUtils/libOpenGLUtils.la