From 5a7d8628006d71f04d06f37638919366170e03ec Mon Sep 17 00:00:00 2001 From: Andrei Costinescu Date: Sat, 12 Feb 2022 22:18:51 +0100 Subject: [PATCH] Add check to not include opencv twice when including comm --- cmake/packageConfigComponents.cmake.in | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/cmake/packageConfigComponents.cmake.in b/cmake/packageConfigComponents.cmake.in index e10923d..7b1843e 100644 --- a/cmake/packageConfigComponents.cmake.in +++ b/cmake/packageConfigComponents.cmake.in @@ -40,14 +40,16 @@ endforeach() ### ADD EXTERNAL DEPENDENCIES IF NEEDED: opencv ### if (${@PROJECT_NAME@_REQUEST_OPENCV}) - if ("${OPENCV_VERSION}" STREQUAL "") - find_package(OpenCV REQUIRED COMPONENTS highgui) - else () - find_package(OpenCV ${OPENCV_VERSION} REQUIRED COMPONENTS highgui) + if ((NOT DEFINED OPENCV_HIGHGUI_FOUND) OR (NOT ${OPENCV_HIGHGUI_FOUND}) OR (NOT DEFINED OpenCV_highgui_FOUND) OR (NOT ${OpenCV_highgui_FOUND})) + if ("${OPENCV_VERSION}" STREQUAL "") + find_package(OpenCV REQUIRED COMPONENTS highgui) + else () + find_package(OpenCV ${OPENCV_VERSION} REQUIRED COMPONENTS highgui) + endif () + + include_directories(${OpenCV_INCLUDE_DIRS}) + set(@PROJECT_NAME@_EXTERNAL_LIBRARIES ${OpenCV_LIBS} ${@PROJECT_NAME@_EXTERNAL_LIBRARIES}) endif () - - include_directories(${OpenCV_INCLUDE_DIRS}) - set(@PROJECT_NAME@_EXTERNAL_LIBRARIES ${OpenCV_LIBS} ${@PROJECT_NAME@_EXTERNAL_LIBRARIES}) endif () ### START POPULATING @PROJECT_NAME@_INCLUDE and @PROJECT_NAME@_LIBRARY variables