Find OpenCV in root CMakeLists.txt

wpilibsuite · Jul 9, 2024 · 7cd5696 · 7cd5696
1 parent 63681e1
commit 7cd5696
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -302,6 +302,7 @@ endif()
 if(WITH_CSCORE)
     set(CAMERASERVER_DEP_REPLACE "find_dependency(cameraserver)")
     set(CSCORE_DEP_REPLACE "find_dependency(cscore)")
+    find_package(OpenCV REQUIRED)
     add_subdirectory(cscore)
     add_subdirectory(cameraserver)
 endif()

diff --git a/cameraserver/CMakeLists.txt b/cameraserver/CMakeLists.txt
@@ -3,8 +3,6 @@ project(cameraserver)
 include(CompileWarnings)
 include(AddTest)
 
-find_package(OpenCV REQUIRED)
-
 # Java bindings
 if(WITH_JAVA)
     include(UseJava)

diff --git a/cscore/CMakeLists.txt b/cscore/CMakeLists.txt
@@ -5,8 +5,6 @@ include(CompileWarnings)
 include(AddTest)
 include(LinkMacOSGUI)
 
-find_package(OpenCV REQUIRED)
-
 file(GLOB cscore_native_src src/main/native/cpp/*.cpp)
 file(GLOB cscore_linux_src src/main/native/linux/*.cpp)
 file(GLOB cscore_osx_src src/main/native/osx/*.cpp)

diff --git a/wpilibc/CMakeLists.txt b/wpilibc/CMakeLists.txt
@@ -25,7 +25,6 @@ target_include_directories(
 wpilib_target_warnings(wpilibc)
 
 if(WITH_CSCORE)
-    find_package(OpenCV)
     target_link_libraries(wpilibc PUBLIC cameraserver cscore ${OpenCV_LIBS})
 else()
     target_compile_definitions(wpilibc PRIVATE DYNAMIC_CAMERA_SERVER)

diff --git a/wpilibj/CMakeLists.txt b/wpilibj/CMakeLists.txt
@@ -2,7 +2,6 @@ project(wpilibj)
 
 # Java bindings
 if(WITH_JAVA)
-    find_package(OpenCV REQUIRED)
     include(UseJava)
 
     set(OPENCV_JAVA_INSTALL_DIR ${OpenCV_INSTALL_PATH}/share/java/opencv4)