Merge pull request bayesmix-dev#154 from TeoGiane/update_deps

Update `bayesmix` dependencies

CMakeLists.txt

@@ -95,7 +95,7 @@ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 set(INCLUDE_PATHS
   ${BASEPATH}
   ${math_SOURCE_DIR}
-  ${math_SOURCE_DIR}/lib/boost_1.78.0
+  ${math_SOURCE_DIR}/lib/boost_1.84.0
   ${math_SOURCE_DIR}/lib/eigen_3.4.0
   ${math_SOURCE_DIR}/lib/sundials_6.1.1/include
   ${math_SOURCE_DIR}/lib/tbb_2020.3/include

cmake/math.cmake

@@ -1,13 +1,9 @@
-# Define patch command to inject
-set(math-tbb_patch git apply ${BASEPATH}/resources/patches/math-tbb.patch)
-
 # Fetching bayesmix-dev/math
 message(STATUS "")
 message(STATUS "Fetching bayesmix-dev/math")
 FetchContent_Declare(math
   GIT_REPOSITORY "https://github.com/bayesmix-dev/math.git"
   GIT_TAG "develop"
-  PATCH_COMMAND ${math-tbb_patch}
 )
 FetchContent_MakeAvailable(math)
 

cmake/matplotplusplus.cmake

@@ -5,8 +5,8 @@ set(matplotplusplus_patch git apply ${BASEPATH}/resources/patches/matplotplusplu
 message(STATUS "")
 message(STATUS "Fetching alandefreitas/matplotplusplus")
 FetchContent_Declare(matplotplusplus
-	DOWNLOAD_EXTRACT_TIMESTAMP TRUE
+	GIT_REPOSITORY "https://github.com/alandefreitas/matplotplusplus.git"
+	GIT_TAG "v1.2.1"
 	PATCH_COMMAND ${matplotplusplus_patch}
-	URL "https://github.com/alandefreitas/matplotplusplus/archive/refs/tags/v1.2.0.tar.gz"
 )
 FetchContent_MakeAvailable(matplotplusplus)

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)