Update OpenCV patching to support Config.cmake

BRL-CAD · Oct 11, 2024 · 67903cf · 67903cf
1 parent a5d4856
commit 67903cf
Show file tree

Hide file tree

Showing 3 changed files with 82 additions and 380 deletions.
diff --git a/opencv/CMakeLists.txt b/opencv/CMakeLists.txt
@@ -17,7 +17,7 @@ if (ENABLE_OPENCV)
   ExternalProject_Add(OPENCV_BLD
     URL "${CMAKE_CURRENT_SOURCE_DIR}/opencv"
     BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
-    PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/opencv.patch
+    PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/opencv_cmake.patch
     CMAKE_ARGS
     -DMIN_VER_CMAKE=3.19
     -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON

diff --git a/opencv/opencv.patch b/opencv/opencv.patch