patch

bambulab · Jun 8, 2024 · ec5fce3 · ec5fce3
1 parent 1220ebe
commit ec5fce3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/deps/Boost/Boost.cmake b/deps/Boost/Boost.cmake
@@ -26,7 +26,7 @@ elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
     elseif (MSVC_VERSION LESS 1930)
     # 1920-1929 = VS 16.0 (v142 toolset)
         set(_boost_toolset "msvc-14.2")
-    elseif (MSVC_VERSION LESS 1949)
+    elseif (MSVC_VERSION LESS 1950)
     # 1930-1949 = VS 17.0 (v143 toolset)
         set(_boost_toolset "msvc-14.3")
     else ()

diff --git a/deps/OpenCV/0001-OpenCV-fix.patch b/deps/OpenCV/0001-OpenCV-fix.patch
@@ -1,4 +1,4 @@
-From 12dacea92956fef7e1ea0da00440349f56034e8f Mon Sep 17 00:00:00 2001
+From 6fb3f6333150a777e835fc7c48e49750591bf7fe Mon Sep 17 00:00:00 2001
 From: Benjamin Buch <bebuch@users.noreply.github.com>
 Date: Thu, 23 May 2024 16:05:19 +0200
 Subject: [PATCH] Support VS 2022 17.1x.y
@@ -22,9 +22,9 @@ index b0f254ebe8..62e36272f3 100644
      check_one_config(has_VS2022)
      if(NOT has_VS2022)
 -- 
-2.45.0.windows.1
+2.45.2.windows.1
 
-From c960f971b080b8aefc5fda80bf9184b241e1e9fd Mon Sep 17 00:00:00 2001
+From f85818ba6f9031c450475a7453dee0acce31a881 Mon Sep 17 00:00:00 2001
 From: Benjamin Buch <bebuch@users.noreply.github.com>
 Date: Fri, 24 May 2024 11:10:09 +0200
 Subject: [PATCH] Support VS 2022 17.1x.y in OpenCVDetectCXXCompiler.cmake
@@ -35,10 +35,10 @@ With 17.10.0 the MSVC toolset was set to 19.40.x which breaks the compatibility
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/cmake/OpenCVDetectCXXCompiler.cmake b/cmake/OpenCVDetectCXXCompiler.cmake
-index 7f229cde96..92e204a5b9 100644
+index 1743aca11f..448afd46ea 100644
 --- a/cmake/OpenCVDetectCXXCompiler.cmake
 +++ b/cmake/OpenCVDetectCXXCompiler.cmake
-@@ -171,7 +171,7 @@ elseif(MSVC)
+@@ -176,7 +176,7 @@ elseif(MSVC)
      set(OpenCV_RUNTIME vc15)
    elseif(MSVC_VERSION MATCHES "^192[0-9]$")
      set(OpenCV_RUNTIME vc16)
@@ -48,5 +48,5 @@ index 7f229cde96..92e204a5b9 100644
    else()
      message(WARNING "OpenCV does not recognize MSVC_VERSION \"${MSVC_VERSION}\". Cannot set OpenCV_RUNTIME")
 -- 
-2.45.0.windows.1
+2.45.2.windows.1
 
diff --git a/deps/OpenCV/OpenCV.cmake b/deps/OpenCV/OpenCV.cmake
@@ -7,7 +7,7 @@ endif ()
 bambustudio_add_cmake_project(OpenCV
     URL https://github.com/opencv/opencv/archive/refs/tags/4.6.0.tar.gz
     URL_HASH SHA256=1ec1cba65f9f20fe5a41fda1586e01c70ea0c9a6d7b67c9e13edf0cfe2239277
-    PATCH_COMMAND ${GIT_EXECUTABLE} apply --verbose --ignore-space-change --whitespace=fix ${CMAKE_CURRENT_LIST_DIR}/0001-OpenCV-fix.patch
+    PATCH_COMMAND git apply --directory ${BINARY_DIR_REL}/dep_OpenCV-prefix/src/dep_OpenCV --verbose --ignore-space-change --whitespace=fix ${CMAKE_CURRENT_LIST_DIR}/0001-OpenCV-fix.patch
     CMAKE_ARGS
     -DBUILD_SHARED_LIBS=0
        -DBUILD_PERE_TESTS=OFF

diff --git a/deps/deps-windows.cmake b/deps/deps-windows.cmake
@@ -16,7 +16,7 @@ elseif (MSVC_VERSION LESS 1930)
 # 1920-1929 = VS 16.0 (v142 toolset)
     set(DEP_VS_VER "16")
     set(DEP_BOOST_TOOLSET "msvc-14.2")
-elseif (MSVC_VERSION LESS 1949)
+elseif (MSVC_VERSION LESS 1950)
 # 1930-1949 = VS 17.0 (v143 toolset)
     set(DEP_VS_VER "17")
     set(DEP_BOOST_TOOLSET "msvc-14.3")