Merge pull request #138 from zhaoxi-scut/merge-master-into-2.x

Merge master into 2.x
cv-rmvl · Jul 25, 2024 · 4a16287 · 4a16287
2 parents 580c1b3 + 69f6d50
commit 4a16287
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 15 deletions.
diff --git a/cmake/RMVLModule.cmake b/cmake/RMVLModule.cmake
@@ -248,7 +248,7 @@ function(rmvl_add_test test_name test_kind)
     return()
   endif()
   # Add arguments variable
-  set(multi_args DEPENDS DEPEND_TESTS)
+  set(multi_args DEPENDS EXTERNAL)
   if(NOT "${test_kind}" MATCHES "^(Unit|Performance)$")
     message(FATAL_ERROR "Unknown test kind : ${test_kind}")
   endif()
@@ -293,7 +293,7 @@ function(rmvl_add_test test_name test_kind)
   # Test depends
   target_link_libraries(
     ${the_target}
-    PRIVATE ${TS_DEPEND_TESTS}
+    PRIVATE ${TS_EXTERNAL}
   )
 
   # Add test

diff --git a/extra/combo/CMakeLists.txt b/extra/combo/CMakeLists.txt
@@ -35,7 +35,7 @@ if(BUILD_TESTS)
   rmvl_add_test(
     combo Unit
     DEPENDS armor rune
-    DEPEND_TESTS GTest::gtest_main
+    EXTERNAL GTest::gtest_main
   )
 endif(BUILD_TESTS)
 

diff --git a/extra/compensator/CMakeLists.txt b/extra/compensator/CMakeLists.txt
@@ -35,7 +35,7 @@ if(BUILD_TESTS)
   rmvl_add_test(
     compensator Unit
     DEPENDS gravity_compensator
-    DEPEND_TESTS GTest::gtest_main
+    EXTERNAL GTest::gtest_main
   )
 endif()
 

diff --git a/extra/detector/CMakeLists.txt b/extra/detector/CMakeLists.txt
@@ -60,7 +60,7 @@ if(BUILD_TESTS)
   rmvl_add_test(
     detector Unit
     DEPENDS armor_detector rune_detector gyro_detector
-    DEPEND_TESTS GTest::gtest_main
+    EXTERNAL GTest::gtest_main
   )
 endif(BUILD_TESTS)
 

diff --git a/extra/feature/CMakeLists.txt b/extra/feature/CMakeLists.txt
@@ -62,7 +62,7 @@ if(BUILD_TESTS)
   rmvl_add_test(
     feature Unit
     DEPENDS light_blob pilot rune_center rune_target
-    DEPEND_TESTS GTest::gtest_main
+    EXTERNAL GTest::gtest_main
   )
 endif(BUILD_TESTS)
 

diff --git a/extra/group/CMakeLists.txt b/extra/group/CMakeLists.txt
@@ -35,7 +35,7 @@ if(BUILD_TESTS)
   rmvl_add_test(
     group Unit
     DEPENDS gyro_group gyro_tracker
-    DEPEND_TESTS GTest::gtest_main
+    EXTERNAL GTest::gtest_main
   )
 endif(BUILD_TESTS)
 

diff --git a/extra/predictor/CMakeLists.txt b/extra/predictor/CMakeLists.txt
@@ -55,7 +55,7 @@ if(BUILD_TESTS)
   rmvl_add_test(
     predictor Unit
     DEPENDS spi_rune_predictor
-    DEPEND_TESTS GTest::gtest_main
+    EXTERNAL GTest::gtest_main
   )
 endif(BUILD_TESTS)
 

diff --git a/extra/tracker/CMakeLists.txt b/extra/tracker/CMakeLists.txt
@@ -45,7 +45,7 @@ if(BUILD_TESTS)
   rmvl_add_test(
     tracker Unit
     DEPENDS planar_tracker rune_tracker gyro_tracker
-    DEPEND_TESTS GTest::gtest_main
+    EXTERNAL GTest::gtest_main
   )
 endif(BUILD_TESTS)
 

diff --git a/extra/types/CMakeLists.txt b/extra/types/CMakeLists.txt
@@ -13,6 +13,6 @@ if(BUILD_TESTS)
   rmvl_add_test(
     types Unit
     DEPENDS types
-    DEPEND_TESTS GTest::gtest_main
+    EXTERNAL GTest::gtest_main
   )
 endif()
diff --git a/modules/algorithm/CMakeLists.txt b/modules/algorithm/CMakeLists.txt
@@ -21,14 +21,14 @@ if(BUILD_TESTS)
   rmvl_add_test(
     algorithm Unit
     DEPENDS algorithm
-    DEPEND_TESTS GTest::gtest_main
+    EXTERNAL GTest::gtest_main
   )
 endif(BUILD_TESTS)
 
 if(BUILD_PERF_TESTS)
   rmvl_add_test(
     algorithm Performance
     DEPENDS algorithm
-    DEPEND_TESTS benchmark::benchmark_main $<$<BOOL:${WITH_OPENCV}>:opencv_videoio>
+    EXTERNAL benchmark::benchmark_main $<$<BOOL:${WITH_OPENCV}>:opencv_videoio>
   )
 endif(BUILD_PERF_TESTS)
diff --git a/modules/core/CMakeLists.txt b/modules/core/CMakeLists.txt
@@ -25,14 +25,14 @@ if(BUILD_TESTS)
   rmvl_add_test(
     core Unit
     DEPENDS core
-    DEPEND_TESTS GTest::gtest_main
+    EXTERNAL GTest::gtest_main
   )
 endif(BUILD_TESTS)
 
 if(BUILD_PERF_TESTS)
   rmvl_add_test(
     core Performance
     DEPENDS core
-    DEPEND_TESTS benchmark::benchmark_main
+    EXTERNAL benchmark::benchmark_main opencv_video
   )
 endif(BUILD_PERF_TESTS)
diff --git a/modules/opcua/CMakeLists.txt b/modules/opcua/CMakeLists.txt
@@ -13,7 +13,7 @@ if(BUILD_TESTS AND WITH_OPEN62541)
   rmvl_add_test(
     opcua Unit
     DEPENDS opcua
-    DEPEND_TESTS GTest::gtest_main
+    EXTERNAL GTest::gtest_main
   )
 endif()