use generic opencv/opencv4 support from base/cmake

CMakeLists.txt

@@ -1,17 +1,13 @@
 # CMakeLists.txt has to be located in the project folder and cmake has to be
 # executed from 'project/build' with 'cmake ../'.
 
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.9)
 project(frame_helper
         VERSION 1.0
         DESCRIPTION "Library for manipulating Rock Core image type")
 find_package(Rock)
 rock_init()
 
-option(OPENCV4 "Whether OpenCV 4 or later should be used" OFF)
-if (OPENCV4)
-    set(opencv_pkgconfig_suffix 4)
-endif()
-
+include(RockAutodetectOpenCV)
+rock_autodetect_opencv(OPENCV_PACKAGE)
 rock_standard_layout()
-set(PROJECT_DESCRIPTION "Library for manipulating frames")

src/CMakeLists.txt

@@ -23,8 +23,7 @@ rock_library(${PROJECT_NAME}
         FrameHelper.h
         FrameHelperTypes.h
         FrameQImageConverter.h
-    DEPS_PKGCONFIG base-types opencv${opencv_pkgconfig_suffix} jpeg_conversion
-    DEPS_PLAIN 
-        Boost_REGEX
+    DEPS_PKGCONFIG base-types ${OPENCV_PACKAGE} jpeg_conversion
+    DEPS_PLAIN Boost_REGEX
     LIBS ${LIBV4l2_LIBRARIES} ${LIBV4l2C_LIBRARIES}
 )