From 673bcf7c932ab62598c9d6b14067e8f85df09bd8 Mon Sep 17 00:00:00 2001 From: TeoGiane Date: Wed, 6 Mar 2024 12:13:28 +0100 Subject: [PATCH] Update matplotplusplus patch --- resources/patches/matplotplusplus.patch | 39 ++++++++++++++++--------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/resources/patches/matplotplusplus.patch b/resources/patches/matplotplusplus.patch index c4559bbb7..6b90f9342 100644 --- a/resources/patches/matplotplusplus.patch +++ b/resources/patches/matplotplusplus.patch @@ -1,20 +1,31 @@ diff --git a/source/3rd_party/CMakeLists.txt b/source/3rd_party/CMakeLists.txt -index b5656e1..ad1ccc5 100644 +index b5656e1..f89b6d1 100644 --- a/source/3rd_party/CMakeLists.txt +++ b/source/3rd_party/CMakeLists.txt -@@ -115,7 +115,7 @@ if(FFTW_FOUND) +@@ -114,16 +114,16 @@ if(FFTW_FOUND) + target_include_directories(cimg INTERFACE ${FFTW_INCLUDE_DIRS}) endif() - - if (CMAKE_MODULE_PATH) + +-if (CMAKE_MODULE_PATH) - find_package(OpenCV QUIET) -+ # find_package(OpenCV QUIET) - if (OpenCV_FOUND) - target_compile_definitions(cimg INTERFACE cimg_use_opencv) - target_link_libraries(cimg INTERFACE ${OpenCV_LIBRARIES}) -@@ -153,4 +153,4 @@ endif() - if(MASTER_PROJECT AND NOT BUILD_SHARED_LIBS) - install(TARGETS cimg - EXPORT Matplot++Targets) +- if (OpenCV_FOUND) +- target_compile_definitions(cimg INTERFACE cimg_use_opencv) +- target_link_libraries(cimg INTERFACE ${OpenCV_LIBRARIES}) +- target_include_directories(cimg INTERFACE ${OpenCV_INCLUDE_DIRS}) +- endif() +-else() +- message("No CMAKE_MODULE_PATH path for OpenCV configured") -endif() -\ No newline at end of file -+endif() ++# if (CMAKE_MODULE_PATH) ++# find_package(OpenCV QUIET) ++# if (OpenCV_FOUND) ++# target_compile_definitions(cimg INTERFACE cimg_use_opencv) ++# target_link_libraries(cimg INTERFACE ${OpenCV_LIBRARIES}) ++# target_include_directories(cimg INTERFACE ${OpenCV_INCLUDE_DIRS}) ++# endif() ++# else() ++# message("No CMAKE_MODULE_PATH path for OpenCV configured") ++# endif() + + + if(LIBAVCODEC_FOUND AND LIBAVFORMAT_FOUND AND LIBSWSCALE_FOUND AND LIBAVUTIL_FOUND)