From 96b7576a1d1ff0b212f8f92ef631cdefe2715862 Mon Sep 17 00:00:00 2001
From: Joao Carreira <jfmcarreira@gmail.com>
Date: Fri, 3 Dec 2021 23:06:53 +0000
Subject: [PATCH] Fix optional opencv dependency

---
 .github/workflows/build.yml        |  2 +-
 .pre-commit-config.yaml            | 10 +++++-----
 lib/CalypModuleIf.cpp              |  6 ++++--
 modules/tests/TestModuleCreate.cpp |  2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 06e0a68..816b43c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -34,7 +34,7 @@ jobs:
     - name: Build without threads
       run: cmake -B ${{github.workspace}}/build -D CMAKE_C_COMPILER=gcc-10 -D CMAKE_CXX_COMPILER=g++-10 -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DUSE_WERROR=ON -DCALYP_MANAGED_RESOURCES=OFF -DCALYP_THREADED_MODULES=OFF; cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
 
-    - name: Build without threads
+    - name: Build without dependencies
       run: cmake -B ${{github.workspace}}/build -D CMAKE_C_COMPILER=gcc-10 -D CMAKE_CXX_COMPILER=g++-10 -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DUSE_WERROR=ON -DUSE_OPENCV=OFF -DUSE_FFMPEG=OFF; cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
 
   check-tests:
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 6f4540c..de1d4f6 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -20,10 +20,10 @@ repos:
       entry: cmake -B build
       pass_filenames: false
       language: system
-    - id: cmake-build
-      name: Cmake Build
-      entry: cmake --build build
-      pass_filenames: false
-      language: system
+        #- id: cmake-build
+        #name: Cmake Build
+        #entry: cmake --build build
+        #pass_filenames: false
+        #language: system
 
 
diff --git a/lib/CalypModuleIf.cpp b/lib/CalypModuleIf.cpp
index 6c0af88..187912e 100644
--- a/lib/CalypModuleIf.cpp
+++ b/lib/CalypModuleIf.cpp
@@ -24,12 +24,14 @@
 
 #include "CalypModuleIf.h"
 
-#include <opencv2/opencv.hpp>
-
 #include "CalypFrame.h"
 #include "PixelFormats.h"
 #include "config.h"
 
+#ifdef USE_OPENCV
+#include <opencv2/opencv.hpp>
+#endif
+
 bool CalypOpenCVModuleIf::create( std::vector<CalypFrame*> apcFrameList )
 {
 #ifdef USE_OPENCV
diff --git a/modules/tests/TestModuleCreate.cpp b/modules/tests/TestModuleCreate.cpp
index 018c471..da7f09a 100644
--- a/modules/tests/TestModuleCreate.cpp
+++ b/modules/tests/TestModuleCreate.cpp
@@ -89,7 +89,7 @@ TEST_F( TestModuleCreate, FIND_MODULE )
 TEST_F( TestModuleCreate, CREATE_OK )
 {
   bool moduleRequireOptions = false;
-  if( pcModule->m_uiModuleRequirements & ClpModuleFeature::Options )
+  if( pcModule->has( ClpModuleFeature::Options ) )
   {
     moduleRequireOptions = true;
   }