Update OpenCV to 4.10.0.

Mr-Ojii · Jun 14, 2024 · 76e7a66 · 76e7a66
1 parent 818e78a
commit 76e7a66
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,8 +13,8 @@ jobs:
 
     - name: Build OpenCV
       run: |
-        git clone https://github.com/opencv/opencv.git -b 4.9.0 --depth 1
-        git clone https://github.com/opencv/opencv_contrib.git -b 4.9.0 --depth 1
+        git clone https://github.com/opencv/opencv.git -b 4.10.0 --depth 1
+        git clone https://github.com/opencv/opencv_contrib.git -b 4.10.0 --depth 1
         cmake -S opencv -B opencv/build -D CMAKE_GENERATOR_PLATFORM=Win32 -D OPENCV_EXTRA_MODULES_PATH=./opencv_contrib/modules -D BUILD_SHARED_LIBS=OFF -D BUILD_PERF_TESTS=OFF -D BUILD_TESTS=OFF -D WITH_ADE=OFF -D WITH_OPENJPEG=OFF -D WITH_WEBP=OFF -D WITH_TIFF=OFF -D WITH_QUIRC=OFF -D WITH_OPENEXR=OFF -D WITH_JPEG=OFF -D WITH_LAPACK=OFF -D WITH_JASPER=OFF -D WITH_PNG=OFF -D WITH_GSTREAMER=OFF -D WITH_FFMPEG=OFF -D WITH_EIGEN=OFF -D WITH_DSHOW=OFF -D WITH_DIRECTX=OFF -D WITH_ARITH_DEC=OFF -D WITH_ARITH_ENC=OFF -D WITH_1394=OFF -D WITH_IMGCODEC_HDR=OFF -D WITH_IMGCODEC_PFM=OFF -D WITH_IMGCODEC_PXM=OFF -D WITH_IMGCODEC_SUNRASTER=OFF -D BUILD_OPENJPEG=OFF -D BUILD_JASPER=OFF -D BUILD_JAVA=OFF -D BUILD_JPEG=OFF -D BUILD_OPENEXR=OFF -D BUILD_PNG=OFF -D BUILD_TBB=OFF -D BUILD_opencv_python3=OFF
         cmake --build opencv/build --config Release
         cmake --install opencv/build

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -15,7 +15,10 @@ target_sources(${PROJECT_NAME} PRIVATE main.cpp main.def bgs.cpp hsv.cpp resourc
 set_target_properties(${PROJECT_NAME} PROPERTIES SUFFIX ".auf")
 target_include_directories(${PROJECT_NAME} PRIVATE ${OPENCV_INCLUDE_DIR})
 target_link_directories(${PROJECT_NAME} PRIVATE ${OPENCV_LIBRARY_DIR})
-target_link_libraries(${PROJECT_NAME} PRIVATE comctl32 ippicvmt debug ippiwd debug ittnotifyd debug opencv_core490d debug opencv_highgui490d debug opencv_imgcodecs490d debug opencv_imgproc490d debug opencv_objdetect490d debug opencv_tracking490d debug opencv_video490d debug opencv_calib3d490d debug opencv_flann490d debug opencv_features2d490d debug opencv_dnn490d debug zlibd debug libprotobufd optimized ippiw optimized ittnotify optimized opencv_core490 optimized opencv_highgui490 optimized opencv_imgcodecs490 optimized opencv_imgproc490 optimized opencv_objdetect490 optimized opencv_tracking490 optimized opencv_video490 optimized opencv_calib3d490 optimized opencv_flann490 optimized opencv_features2d490 optimized opencv_dnn490 optimized zlib optimized libprotobuf)
+target_link_libraries(${PROJECT_NAME} PRIVATE comctl32 ippicvmt
+                        debug     ippiwd debug     ittnotifyd debug     opencv_core4100d debug     opencv_highgui4100d debug     opencv_imgcodecs4100d debug     opencv_imgproc4100d debug     opencv_objdetect4100d debug     opencv_tracking4100d debug     opencv_video4100d debug     opencv_calib3d4100d debug     opencv_flann4100d debug     opencv_features2d4100d debug     opencv_dnn4100d debug     zlibd debug     libprotobufd
+                        optimized ippiw  optimized ittnotify  optimized opencv_core4100  optimized opencv_highgui4100  optimized opencv_imgcodecs4100  optimized opencv_imgproc4100  optimized opencv_objdetect4100  optimized opencv_tracking4100  optimized opencv_video4100  optimized opencv_calib3d4100  optimized opencv_flann4100  optimized opencv_features2d4100  optimized opencv_dnn4100  optimized zlib  optimized libprotobuf
+                        )
 
 if("${CMAKE_CXX_COMPILER_ID}" MATCHES "MSVC")
     set_property(TARGET ${PROJECT_NAME} PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")