Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
wolf
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mobile_robotics
wolf_projects
wolf_lib
wolf
Commits
7b69f555
Commit
7b69f555
authored
3 years ago
by
Mederic Fourmy
Browse files
Options
Downloads
Patches
Plain Diff
Remove dummy from gtest/CMakeLists.txt macro
parent
306e6d59
No related branches found
No related tags found
2 merge requests
!451
After cmake and const refactor
,
!445
Resolve "Refactoring WOLF installation system"
Pipeline
#10384
canceled
3 years ago
Changes
3
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+0
-4
0 additions, 4 deletions
CMakeLists.txt
test/CMakeLists.txt
+8
-0
8 additions, 0 deletions
test/CMakeLists.txt
test/gtest/CMakeLists.txt
+2
-2
2 additions, 2 deletions
test/gtest/CMakeLists.txt
with
10 additions
and
6 deletions
CMakeLists.txt
+
0
−
4
View file @
7b69f555
...
@@ -377,10 +377,6 @@ ELSE(Ceres_FOUND)
...
@@ -377,10 +377,6 @@ ELSE(Ceres_FOUND)
SET
(
SRCS_CERES_WRAPPER
)
SET
(
SRCS_CERES_WRAPPER
)
ENDIF
(
Ceres_FOUND
)
ENDIF
(
Ceres_FOUND
)
IF
(
Suitesparse_FOUND
)
#ADD_SUBDIRECTORY(solver_suitesparse)
ENDIF
(
Suitesparse_FOUND
)
# create the shared library
# create the shared library
ADD_LIBRARY
(
${
PLUGIN_NAME
}
ADD_LIBRARY
(
${
PLUGIN_NAME
}
SHARED
SHARED
...
...
This diff is collapsed.
Click to expand it.
test/CMakeLists.txt
+
8
−
0
View file @
7b69f555
...
@@ -27,6 +27,7 @@ wolf_add_gtest(gtest_example gtest_example.cpp) #
...
@@ -27,6 +27,7 @@ wolf_add_gtest(gtest_example gtest_example.cpp) #
# BufferFrame
# BufferFrame
wolf_add_gtest
(
gtest_buffer_frame gtest_buffer_frame.cpp
)
wolf_add_gtest
(
gtest_buffer_frame gtest_buffer_frame.cpp
)
target_link_libraries
(
gtest_buffer_frame PUBLIC dummy
)
# CaptureBase class test
# CaptureBase class test
wolf_add_gtest
(
gtest_capture_base gtest_capture_base.cpp
)
wolf_add_gtest
(
gtest_capture_base gtest_capture_base.cpp
)
...
@@ -42,12 +43,15 @@ wolf_add_gtest(gtest_factor_autodiff gtest_factor_autodiff.cpp)
...
@@ -42,12 +43,15 @@ wolf_add_gtest(gtest_factor_autodiff gtest_factor_autodiff.cpp)
# Factory test
# Factory test
wolf_add_gtest
(
gtest_factory gtest_factory.cpp
)
wolf_add_gtest
(
gtest_factory gtest_factory.cpp
)
target_link_libraries
(
gtest_factory PUBLIC dummy
)
# FactoryStateBlock factory test
# FactoryStateBlock factory test
wolf_add_gtest
(
gtest_factory_state_block gtest_factory_state_block.cpp
)
wolf_add_gtest
(
gtest_factory_state_block gtest_factory_state_block.cpp
)
target_link_libraries
(
gtest_factory_state_block PUBLIC dummy
)
# Node Emplace test
# Node Emplace test
wolf_add_gtest
(
gtest_emplace gtest_emplace.cpp
)
wolf_add_gtest
(
gtest_emplace gtest_emplace.cpp
)
target_link_libraries
(
gtest_emplace PUBLIC dummy
)
# FeatureBase classes test
# FeatureBase classes test
wolf_add_gtest
(
gtest_feature_base gtest_feature_base.cpp
)
wolf_add_gtest
(
gtest_feature_base gtest_feature_base.cpp
)
...
@@ -81,9 +85,11 @@ wolf_add_gtest(gtest_parser_yaml gtest_parser_yaml.cpp)
...
@@ -81,9 +85,11 @@ wolf_add_gtest(gtest_parser_yaml gtest_parser_yaml.cpp)
# Problem class test
# Problem class test
wolf_add_gtest
(
gtest_problem gtest_problem.cpp
)
wolf_add_gtest
(
gtest_problem gtest_problem.cpp
)
target_link_libraries
(
gtest_problem PUBLIC dummy
)
# ProcessorBase class test
# ProcessorBase class test
wolf_add_gtest
(
gtest_processor_base gtest_processor_base.cpp
)
wolf_add_gtest
(
gtest_processor_base gtest_processor_base.cpp
)
target_link_libraries
(
gtest_processor_base PUBLIC dummy
)
# ProcessorMotion class test
# ProcessorMotion class test
wolf_add_gtest
(
gtest_processor_motion gtest_processor_motion.cpp
)
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
...
@@ -197,9 +203,11 @@ wolf_add_gtest(gtest_processor_and_factor_pose_3d_with_extrinsics gtest_processo
# ProcessorTrackerFeatureDummy class test
# ProcessorTrackerFeatureDummy class test
wolf_add_gtest
(
gtest_processor_tracker_feature_dummy gtest_processor_tracker_feature_dummy.cpp
)
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
# ProcessorTrackerLandmarkDummy class test
wolf_add_gtest
(
gtest_processor_tracker_landmark_dummy gtest_processor_tracker_landmark_dummy.cpp
)
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
# SensorDiffDriveSelfcalib class test
wolf_add_gtest
(
gtest_sensor_diff_drive gtest_sensor_diff_drive.cpp
)
wolf_add_gtest
(
gtest_sensor_diff_drive gtest_sensor_diff_drive.cpp
)
...
...
This diff is collapsed.
Click to expand it.
test/gtest/CMakeLists.txt
+
2
−
2
View file @
7b69f555
...
@@ -71,10 +71,10 @@ function(wolf_add_gtest target)
...
@@ -71,10 +71,10 @@ function(wolf_add_gtest target)
add_executable
(
${
target
}
${
ARGN
}
)
add_executable
(
${
target
}
${
ARGN
}
)
if
(
${
CMAKE_VERSION
}
VERSION_LESS
"3.11.0"
)
if
(
${
CMAKE_VERSION
}
VERSION_LESS
"3.11.0"
)
add_dependencies
(
${
target
}
libgtest
)
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
}
)
target_include_directories
(
${
target
}
PUBLIC
${
GTEST_INCLUDE_DIRS
}
)
else
()
else
()
target_link_libraries
(
${
target
}
PUBLIC gtest_main
${
PLUGIN_NAME
}
dummy
)
target_link_libraries
(
${
target
}
PUBLIC gtest_main
${
PLUGIN_NAME
}
)
endif
()
endif
()
add_test
(
NAME
${
target
}
COMMAND
${
target
}
)
add_test
(
NAME
${
target
}
COMMAND
${
target
}
)
endfunction
()
endfunction
()
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment