Updated OpenCV for Mac64 to 4.7.0

cpvrlab · Apr 5, 2024 · e2122bf · e2122bf
1 parent d61cb37
commit e2122bf
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/cmake/DownloadPrebuilts.cmake b/cmake/DownloadPrebuilts.cmake
@@ -540,8 +540,8 @@ elseif ("${SYSTEM_NAME_UPPER}" STREQUAL "DARWIN" AND
     #set(OpenCV_VERSION "3.4.1")
     #set(OpenCV_VERSION "4.1.1")
     #set(OpenCV_VERSION "4.5.0")
-    set(OpenCV_VERSION "4.5.2")
-    #set(OpenCV_VERSION "4.7.0") // does not work with ffmpeg
+    #set(OpenCV_VERSION "4.5.2")
+    set(OpenCV_VERSION "4.7.0")
     set(OpenCV_PREBUILT_DIR "mac64_opencv_${OpenCV_VERSION}")
     set(OpenCV_DIR "${PREBUILT_PATH}/${OpenCV_PREBUILT_DIR}")
     set(OpenCV_INCLUDE_DIR "${OpenCV_DIR}/include")

diff --git a/externals/prebuild_scripts/build_opencv_w_contrib_for_mac64.sh b/externals/prebuild_scripts/build_opencv_w_contrib_for_mac64.sh
@@ -73,10 +73,16 @@ cmake \
 -DBUILD_TESTS=OFF \
 -DWITH_MATLAB=OFF \
 -DBUILD_ZLIB=ON \
+-DWITH_PNG=ON \
 -DBUILD_PNG=ON \
 -DBUILD_JPEG=ON \
+-DWITH_JPEG=ON \
 -DBUILD_TIFF=ON \
+-DWITH_WEBP=ON \
 -DBUILD_WEBP=ON \
+-DWITH_FFMPEG=ON \
+-DBUILD_FFMPEG=ON \
+-DWITH_OPENEXR=ON \
 -DBUILD_OPENEXR=ON \
 -DOPENCV_ENABLE_NONFREE=ON \
 -DOPENCV_EXTRA_MODULES_PATH=../../../opencv_contrib/modules \
@@ -109,10 +115,16 @@ cmake \
 -DBUILD_TESTS=OFF \
 -DWITH_MATLAB=OFF \
 -DBUILD_ZLIB=ON \
+-DWITH_PNG=ON \
 -DBUILD_PNG=ON \
 -DBUILD_JPEG=ON \
+-DWITH_JPEG=ON \
 -DBUILD_TIFF=ON \
+-DWITH_WEBP=ON \
 -DBUILD_WEBP=ON \
+-DWITH_FFMPEG=ON \
+-DBUILD_FFMPEG=ON \
+-DWITH_OPENEXR=ON \
 -DBUILD_OPENEXR=ON \
 -DOPENCV_ENABLE_NONFREE=ON \
 -DOPENCV_EXTRA_MODULES_PATH=../../../opencv_contrib/modules \