From 8842b9b2b2abfaafe52ca4a8f019a3cb35217641 Mon Sep 17 00:00:00 2001 From: Dan Date: Thu, 20 Oct 2016 11:02:18 -0400 Subject: [PATCH] Newer versions of gstreamer use a slightly different include path on windows. Newer versions of VTK have moved some of the reader objects into vtkIOGeometry. --- cmake/FindGstreamerWindows.cmake | 2 +- cmake/OpenCVDetectVTK.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/FindGstreamerWindows.cmake b/cmake/FindGstreamerWindows.cmake index c37fecdf1c..055e8a6094 100644 --- a/cmake/FindGstreamerWindows.cmake +++ b/cmake/FindGstreamerWindows.cmake @@ -15,7 +15,7 @@ FIND_PATH(GSTREAMER_glibconfig_INCLUDE_DIR glibconfig.h ENV INCLUDE DOC "Directory containing glibconfig.h include file") FIND_PATH(GSTREAMER_gstconfig_INCLUDE_DIR gst/gstconfig.h - PATHS ${GSTREAMER_DIR}/lib/gstreamer-1.0/include ${GSTREAMER_DIR}/include ${GSTREAMER_DIR}/lib/include /usr/local/include/gstreamer-1.0 /usr/include/gstreamer-1.0 /usr/local/lib/include/gstreamer-1.0 /usr/lib/include/gstreamer-1.0 + PATHS ${GSTREAMER_DIR}/lib/gstreamer-1.0/include ${GSTREAMER_DIR}/include ${GSTREAMER_DIR}/include/gstreamer-1.0 ${GSTREAMER_DIR}/lib/include /usr/local/include/gstreamer-1.0 /usr/include/gstreamer-1.0 /usr/local/lib/include/gstreamer-1.0 /usr/lib/include/gstreamer-1.0 ENV INCLUDE DOC "Directory containing gst/gstconfig.h include file") FIND_LIBRARY(GSTREAMER_gstaudio_LIBRARY NAMES gstaudio libgstaudio-1.0 gstaudio-1.0 diff --git a/cmake/OpenCVDetectVTK.cmake b/cmake/OpenCVDetectVTK.cmake index e75aef8a0c..c92174f24e 100644 --- a/cmake/OpenCVDetectVTK.cmake +++ b/cmake/OpenCVDetectVTK.cmake @@ -6,7 +6,7 @@ endif() find_package(VTK QUIET COMPONENTS vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport NO_MODULE) IF(VTK_FOUND) IF(VTK_RENDERING_BACKEND) #in vtk 7, the rendering backend is exported as a var. - find_package(VTK QUIET COMPONENTS vtkRendering${VTK_RENDERING_BACKEND} vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport NO_MODULE) + find_package(VTK QUIET COMPONENTS vtkRendering${VTK_RENDERING_BACKEND} vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport vtkIOGeometry NO_MODULE) ELSE(VTK_RENDERING_BACKEND) find_package(VTK QUIET COMPONENTS vtkRenderingOpenGL vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport NO_MODULE) ENDIF(VTK_RENDERING_BACKEND)