From 7b69f555a5979b63a232a657778844399e6d7e0a Mon Sep 17 00:00:00 2001
From: Mederic Fourmy <mederic.fourmy@gmail.com>
Date: Thu, 5 May 2022 13:58:50 +0200
Subject: [PATCH] Remove dummy from gtest/CMakeLists.txt macro
---
CMakeLists.txt | 4 ----
test/CMakeLists.txt | 8 ++++++++
test/gtest/CMakeLists.txt | 4 ++--
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 778b04eda..cdb03bfbd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -377,10 +377,6 @@ ELSE(Ceres_FOUND)
SET(SRCS_CERES_WRAPPER)
ENDIF(Ceres_FOUND)
-IF (Suitesparse_FOUND)
- #ADD_SUBDIRECTORY(solver_suitesparse)
-ENDIF(Suitesparse_FOUND)
-
# create the shared library
ADD_LIBRARY(${PLUGIN_NAME}
SHARED
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 4678691d7..4c1dcdc78 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -27,6 +27,7 @@ wolf_add_gtest(gtest_example gtest_example.cpp) #
# BufferFrame
wolf_add_gtest(gtest_buffer_frame gtest_buffer_frame.cpp)
+target_link_libraries(gtest_buffer_frame PUBLIC dummy)
# CaptureBase class test
wolf_add_gtest(gtest_capture_base gtest_capture_base.cpp)
@@ -42,12 +43,15 @@ wolf_add_gtest(gtest_factor_autodiff gtest_factor_autodiff.cpp)
# Factory test
wolf_add_gtest(gtest_factory gtest_factory.cpp)
+target_link_libraries(gtest_factory PUBLIC dummy)
# FactoryStateBlock factory test
wolf_add_gtest(gtest_factory_state_block gtest_factory_state_block.cpp)
+target_link_libraries(gtest_factory_state_block PUBLIC dummy)
# Node Emplace test
wolf_add_gtest(gtest_emplace gtest_emplace.cpp)
+target_link_libraries(gtest_emplace PUBLIC dummy)
# FeatureBase classes test
wolf_add_gtest(gtest_feature_base gtest_feature_base.cpp)
@@ -81,9 +85,11 @@ wolf_add_gtest(gtest_parser_yaml gtest_parser_yaml.cpp)
# Problem class test
wolf_add_gtest(gtest_problem gtest_problem.cpp)
+target_link_libraries(gtest_problem PUBLIC dummy)
# ProcessorBase class test
wolf_add_gtest(gtest_processor_base gtest_processor_base.cpp)
+target_link_libraries(gtest_processor_base PUBLIC dummy)
# ProcessorMotion class test
wolf_add_gtest(gtest_processor_motion gtest_processor_motion.cpp)
@@ -197,9 +203,11 @@ wolf_add_gtest(gtest_processor_and_factor_pose_3d_with_extrinsics gtest_processo
# ProcessorTrackerFeatureDummy class test
wolf_add_gtest(gtest_processor_tracker_feature_dummy gtest_processor_tracker_feature_dummy.cpp)
+target_link_libraries(gtest_processor_tracker_feature_dummy PUBLIC dummy)
# ProcessorTrackerLandmarkDummy class test
wolf_add_gtest(gtest_processor_tracker_landmark_dummy gtest_processor_tracker_landmark_dummy.cpp)
+target_link_libraries(gtest_processor_tracker_landmark_dummy PUBLIC dummy)
# SensorDiffDriveSelfcalib class test
wolf_add_gtest(gtest_sensor_diff_drive gtest_sensor_diff_drive.cpp)
diff --git a/test/gtest/CMakeLists.txt b/test/gtest/CMakeLists.txt
index 9e2a84991..0fe7d7a08 100644
--- a/test/gtest/CMakeLists.txt
+++ b/test/gtest/CMakeLists.txt
@@ -71,10 +71,10 @@ function(wolf_add_gtest target)
add_executable(${target} ${ARGN})
if(${CMAKE_VERSION} VERSION_LESS "3.11.0")
add_dependencies(${target} libgtest)
- target_link_libraries(${target} libgtest ${PLUGIN_NAME} dummy)
+ target_link_libraries(${target} libgtest ${PLUGIN_NAME})
target_include_directories(${target} PUBLIC ${GTEST_INCLUDE_DIRS})
else()
- target_link_libraries(${target} PUBLIC gtest_main ${PLUGIN_NAME} dummy)
+ target_link_libraries(${target} PUBLIC gtest_main ${PLUGIN_NAME})
endif()
add_test(NAME ${target} COMMAND ${target})
endfunction()
--
GitLab