Skip to content
Snippets Groups Projects
Commit c47a5d64 authored by calrama's avatar calrama
Browse files

OpenCV 4 compatibility

parent affcea6a
Branches
No related tags found
No related merge requests found
Pipeline #23073 passed
Pipeline: utility

#23074

    ...@@ -16,6 +16,11 @@ set(INSTALL_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} CACHE STRING ...@@ -16,6 +16,11 @@ set(INSTALL_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} CACHE STRING
    list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake) list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake)
    include(Headers) include(Headers)
    find_package(OpenCV 4 QUIET)
    if(NOT OpenCV_FOUND)
    find_package(OpenCV 3 REQUIRED)
    endif()
    add_subdirectory(Src) add_subdirectory(Src)
    export( export(
    ......
    ...@@ -26,7 +26,6 @@ target_include_directories(${target} PUBLIC ...@@ -26,7 +26,6 @@ target_include_directories(${target} PUBLIC
    find_package(Qt5 REQUIRED COMPONENTS Core Gui Widgets OpenGL) find_package(Qt5 REQUIRED COMPONENTS Core Gui Widgets OpenGL)
    target_link_libraries(${target} Qt5::Core Qt5::Gui Qt5::Widgets) target_link_libraries(${target} Qt5::Core Qt5::Gui Qt5::Widgets)
    find_package(OpenCV 3 REQUIRED)
    target_link_libraries(${target} ${OpenCV_LIBS}) target_link_libraries(${target} ${OpenCV_LIBS})
    set_target_properties(${target} PROPERTIES AUTOMOC ON AUTOUIC ON AUTORCC ON) set_target_properties(${target} PROPERTIES AUTOMOC ON AUTOUIC ON AUTORCC ON)
    ......
    ...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
    #include "IModel.h" #include "IModel.h"
    #include <string.h> #include <string.h>
    #include <cv.h> #include <opencv2/opencv.hpp>
    class BT_INTERFACES_API IModelAreaDescriptor :public IModel class BT_INTERFACES_API IModelAreaDescriptor :public IModel
    { {
    ......
    ...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
    find_package(Qt5 REQUIRED COMPONENTS Core Gui Widgets OpenGL) find_package(Qt5 REQUIRED COMPONENTS Core Gui Widgets OpenGL)
    find_package(OpenCV 3 REQUIRED) find_package(OpenCV @OpenCV_VERSION_MAJOR@ REQUIRED)
    include(${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake) include(${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake)
    ......
    0% Loading or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Please register or to comment