From 9caa02e93d2041b9937057147e8ea60b80b38dc9 Mon Sep 17 00:00:00 2001
From: Gold856 <117957790+Gold856@users.noreply.github.com>
Date: Sun, 16 Jun 2024 15:57:36 -0400
Subject: [PATCH] [build] cmake: Improve OpenCV file search

---
 apriltag/CMakeLists.txt     | 2 ++
 cameraserver/CMakeLists.txt | 8 ++++++--
 cscore/CMakeLists.txt       | 7 ++++++-
 wpilibj/CMakeLists.txt      | 8 ++++++--
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/apriltag/CMakeLists.txt b/apriltag/CMakeLists.txt
index ee3eafe1414..d098bb01aa8 100644
--- a/apriltag/CMakeLists.txt
+++ b/apriltag/CMakeLists.txt
@@ -42,6 +42,8 @@ if(WITH_JAVA)
             ${OPENCV_JAVA_INSTALL_DIR}
             ${OpenCV_INSTALL_PATH}/bin
             ${OpenCV_INSTALL_PATH}/share/java
+            ${OpenCV_INSTALL_PATH}/share/java/opencv4
+            ${OpenCV_INSTALL_PATH}/share/OpenCV/java
         NO_DEFAULT_PATH
     )
 
diff --git a/cameraserver/CMakeLists.txt b/cameraserver/CMakeLists.txt
index 5e6d92f649a..1270c383db5 100644
--- a/cameraserver/CMakeLists.txt
+++ b/cameraserver/CMakeLists.txt
@@ -12,12 +12,16 @@ if(WITH_JAVA)
 
     #find java files, copy them locally
 
-    set(OPENCV_JAVA_INSTALL_DIR ${OpenCV_INSTALL_PATH}/share/OpenCV/java/)
+    set(OPENCV_JAVA_INSTALL_DIR ${OpenCV_INSTALL_PATH}/share/java/opencv4)
 
     find_file(
         OPENCV_JAR_FILE
         NAMES opencv-${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}.jar
-        PATHS ${OPENCV_JAVA_INSTALL_DIR} ${OpenCV_INSTALL_PATH}/bin
+        PATHS
+            ${OPENCV_JAVA_INSTALL_DIR}
+            ${OpenCV_INSTALL_PATH}/bin
+            ${OpenCV_INSTALL_PATH}/share/java
+            ${OpenCV_INSTALL_PATH}/share/OpenCV/java
         NO_DEFAULT_PATH
     )
 
diff --git a/cscore/CMakeLists.txt b/cscore/CMakeLists.txt
index 1fd1e0b6a09..e4f4315acc5 100644
--- a/cscore/CMakeLists.txt
+++ b/cscore/CMakeLists.txt
@@ -88,7 +88,7 @@ if(WITH_JAVA)
     #find java files, copy them locally
 
     if("${OPENCV_JAVA_INSTALL_DIR}" STREQUAL "")
-        set(OPENCV_JAVA_INSTALL_DIR ${OpenCV_INSTALL_PATH}/share/OpenCV/java/)
+        set(OPENCV_JAVA_INSTALL_DIR ${OpenCV_INSTALL_PATH}/share/java/opencv4)
     endif()
 
     find_file(
@@ -98,6 +98,7 @@ if(WITH_JAVA)
             ${OPENCV_JAVA_INSTALL_DIR}
             ${OpenCV_INSTALL_PATH}/bin
             ${OpenCV_INSTALL_PATH}/share/java
+            ${OpenCV_INSTALL_PATH}/share/OpenCV/java
         NO_DEFAULT_PATH
     )
     find_file(
@@ -112,7 +113,10 @@ if(WITH_JAVA)
             ${OpenCV_INSTALL_PATH}/bin/Release
             ${OpenCV_INSTALL_PATH}/bin/Debug
             ${OpenCV_INSTALL_PATH}/lib
+            ${OpenCV_INSTALL_PATH}/lib/Release
+            ${OpenCV_INSTALL_PATH}/lib/Debug
             ${OpenCV_INSTALL_PATH}/lib/jni
+            ${OpenCV_INSTALL_PATH}/share/java/opencv4
         NO_DEFAULT_PATH
     )
 
@@ -142,6 +146,7 @@ if(WITH_JAVA)
                 ${cvFile}Loc
                 NAMES
                     ${cvFile}${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}.dll
+                    ${cvFile}${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}d.dll
                 PATHS
                     ${OPENCV_JAVA_INSTALL_DIR}
                     ${OpenCV_INSTALL_PATH}/bin
diff --git a/wpilibj/CMakeLists.txt b/wpilibj/CMakeLists.txt
index 2418b6d3edf..e2a8fb331a7 100644
--- a/wpilibj/CMakeLists.txt
+++ b/wpilibj/CMakeLists.txt
@@ -6,12 +6,16 @@ if(WITH_JAVA)
     find_package(Java REQUIRED)
     include(UseJava)
 
-    set(OPENCV_JAVA_INSTALL_DIR ${OpenCV_INSTALL_PATH}/share/OpenCV/java/)
+    set(OPENCV_JAVA_INSTALL_DIR ${OpenCV_INSTALL_PATH}/share/java/opencv4)
 
     find_file(
         OPENCV_JAR_FILE
         NAMES opencv-${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}.jar
-        PATHS ${OPENCV_JAVA_INSTALL_DIR} ${OpenCV_INSTALL_PATH}/bin
+        PATHS
+            ${OPENCV_JAVA_INSTALL_DIR}
+            ${OpenCV_INSTALL_PATH}/bin
+            ${OpenCV_INSTALL_PATH}/share/java
+            ${OpenCV_INSTALL_PATH}/share/OpenCV/java
         NO_DEFAULT_PATH
     )