rnc: fix error in checking of opencv at configure step

This commit is contained in:
gdd 2011-11-08 14:31:36 +00:00
parent 7505d4bef2
commit 02971b5182

View File

@ -33,6 +33,8 @@ if WITH_OPENCV
PictureImportDlg_moc = EntityGUI_PictureImportDlg_moc.cxx PictureImportDlg_moc = EntityGUI_PictureImportDlg_moc.cxx
Opencv_libs = $(OPENCV_LIBS) Opencv_libs = $(OPENCV_LIBS)
Opencv_includes = $(OPENCV_INCLUDES) Opencv_includes = $(OPENCV_INCLUDES)
ShapeRec_dir = $(srcdir)/../ShapeRecognition
ShapeRec_la = ../ShapeRecognition/libGEOMShapeRec.la
endif endif
# Libraries targets # Libraries targets
@ -106,17 +108,18 @@ libEntityGUI_la_CPPFLAGS = \
-I$(srcdir)/../GEOMImpl \ -I$(srcdir)/../GEOMImpl \
-I$(srcdir)/../GEOMFiltersSelection \ -I$(srcdir)/../GEOMFiltersSelection \
-I$(srcdir)/../SKETCHER \ -I$(srcdir)/../SKETCHER \
-I$(srcdir)/../ShapeRecognition \ -I$(ShapeRec_dir) \
-I$(srcdir)/../GEOM \ -I$(srcdir)/../GEOM \
-I$(top_builddir)/src/DlgRef \ -I$(top_builddir)/src/DlgRef \
-I$(top_builddir)/idl -I$(top_builddir)/idl
libEntityGUI_la_LDFLAGS = \ libEntityGUI_la_LDFLAGS = \
../GEOMFiltersSelection/libGEOMFiltersSelection.la \ ../GEOMFiltersSelection/libGEOMFiltersSelection.la \
../GEOMBase/libGEOMBase.la \ ../GEOMBase/libGEOMBase.la \
../SKETCHER/libGEOMSketcher.la \ ../SKETCHER/libGEOMSketcher.la \
../GEOMGUI/libGEOM.la \ ../GEOMGUI/libGEOM.la \
../ShapeRecognition/libGEOMShapeRec.la \ $(ShapeRec_la) \
$(QT_MT_LIBS) \ $(QT_MT_LIBS) \
$(CAS_TKTopAlgo) -lTKernel \ $(CAS_TKTopAlgo) -lTKernel \
$(Opencv_libs) $(Opencv_libs)