Fixing OpenCV compilation + C++17 selection

Author: ErickOF

modules/Makefile

@@ -1,15 +1,33 @@
-SYSTEMC?=$(HOME)/systemc-2.3.3
+SYSTEMC?=$(SYSTEMC_HOME)
 TARGET?=test
 
 # Compiler
 CC=g++
 CFLAGS=-Wall -I. -O3 -g -Wextra -Wunused-function
 
+ifdef USE_CPP17
+CFLAGS+=-std=c++17
+endif
+
 # Target
 LD=g++
 LFLAGS=-Wall -I. -lm -g
 LIBS=-lsystemc -lm
 
+ifdef INCLUDE_OPENCV
+# Target
+LIBS+=-lopencv_imgcodecs -lopencv_core -lopencv_highgui -lopencv_imgproc
+
+# Source directories
+INCDIR+=-I$(OPENCV_H_DIR)
+LIBDIR+=-L$(OPENCV_SO_DIR)
+else
+ifdef INCLUDE_OPENCV_PKG
+CFLAGS += $(shell pkg-config --cflags opencv4)
+LFLAGS += $(shell pkg-config --libs opencv4)
+endif # INCLUDE_OPENCV_PKG
+endif # INCLUDE_OPENCV
+
 # Source directories
 SRCDIR=src
 OBJDIR=obj

modules/edge-detector/Makefile

@@ -1,18 +1,6 @@
 # Include common Makefile
 include ../Makefile
 
-ifdef INCLUDE_OPENCV
-# Target
-LIBS+=-lopencv_imgcodecs -lopencv_core -lopencv_highgui -lopencv_imgproc
-
-# Source directories
-INCDIR+=-I/usr/local/include/opencv4
-LIBDIR+=-L/usr/local/lib
-else
-CFLAGS += $(shell pkg-config --cflags opencv4)
-LFLAGS += $(shell pkg-config --libs opencv4)
-endif # INCLUDE_OPENCV
-
 # Defining preprocessor directive for debug
 ifdef IPS_DEBUG_EN
 	CFLAGS += -DIPS_DEBUG_EN

modules/filter/Makefile

@@ -1,10 +1,6 @@
 # Include common Makefile
 include ../Makefile
 
-# Include OpenCV for compilation
-CFLAGS += $(shell pkg-config --cflags opencv4)
-LFLAGS += $(shell pkg-config --libs opencv4)
-
 # Defining preprocessor directive for debug
 ifdef IPS_DEBUG_EN
 		CFLAGS += -DIPS_DEBUG_EN

modules/rgb2gray/Makefile

@@ -1,20 +1,6 @@
 # Include common Makefile
 include ../Makefile
 
-CFLAGS+=-std=c++17
-
-ifdef INCLUDE_OPENCV
-# Target
-LIBS+=-lopencv_imgcodecs -lopencv_core -lopencv_highgui -lopencv_imgproc
-
-# Source directories
-INCDIR+=-I$(OPENCV_H_DIR)
-LIBDIR+=-L$(OPENCV_SO_DIR)
-else
-CFLAGS += $(shell pkg-config --cflags opencv4)
-LFLAGS += $(shell pkg-config --libs opencv4)
-endif # INCLUDE_OPENCV
-
 # Defining preprocessor directive for debug
 ifdef IPS_DEBUG_EN
 	CFLAGS += -DIPS_DEBUG_EN

modules/unification/Makefile

@@ -8,7 +8,6 @@ include ../Makefile
 # Include stb lib for compilation
 INCLUDES += INCLUDES_STB
 
-
 # Defining preprocessor directive for using PV model
 ifdef IMG_UNIFICATE_PV_EN
 	CFLAGS += -DIMG_UNIFICATE_PV_EN