Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
V
vision
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor 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
plugins
vision
Commits
1e142f67
Commit
1e142f67
authored
3 years ago
by
Mederic Fourmy
Browse files
Options
Downloads
Patches
Plain Diff
Fix: Link with OpenCV using COMPONENTS
parent
bcaa84ec
No related branches found
No related tags found
2 merge requests
!36
After cmake and const refactor
,
!33
Resolve "Adapt to core CMakeLists.txt refactor"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+25
-4
25 additions, 4 deletions
CMakeLists.txt
include/vision/factor/factor_pixel_hp.h
+0
-6
0 additions, 6 deletions
include/vision/factor/factor_pixel_hp.h
with
25 additions
and
10 deletions
CMakeLists.txt
+
25
−
4
View file @
1e142f67
...
...
@@ -83,8 +83,10 @@ option(_WOLF_TRACE "Enable wolf tracing macro" ON)
# ============ DEPENDENCIES ==================
FIND_PACKAGE
(
wolfcore REQUIRED
)
SET
(
PRINT_INFO_VU false
)
FIND_PACKAGE
(
OpenCV REQUIRED
)
FIND_PACKAGE
(
OpenCV REQUIRED
COMPONENTS core imgcodecs highgui features2d calib3d video
)
# ============ config.h ==================
string
(
TOUPPER
${
PROJECT_NAME
}
UPPER_NAME
)
...
...
@@ -184,10 +186,29 @@ elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
# using GCC
endif
()
#Link the created libraries
#
Link the created libraries
#===============EXAMPLE=========================
TARGET_LINK_LIBRARIES
(
${
PLUGIN_NAME
}
wolfcore
)
TARGET_LINK_LIBRARIES
(
${
PLUGIN_NAME
}
OpenCV
)
# For OpenCV, link with respect to each required components, found in the find_package command
# The required components have the same name as the include files e.g. <opencv2/core.hpp>
# or the opencv2 subdirectory in which they are found, e.g. <opencv2/video/tracking.hpp>
TARGET_LINK_LIBRARIES
(
${
PLUGIN_NAME
}
opencv_core
opencv_imgcodecs
opencv_highgui
opencv_features2d
opencv_calib3d
opencv_video
)
# # TARGET_LINK_LIBRARIES(${PLUGIN_NAME} opencv)
# get_target_property(toto wolfcore INCLUDE_DIRECTORIES)
# message(WARNING ${toto})
# get_target_property(toto wolfcore INTERFACE_INCLUDE_DIRECTORIES)
# message(WARNING ${toto})
# get_target_property(toto wolfcore INTERFACE_SYSTEM_INCLUDE_DIRECTORIES)
# message(WARNING ${toto})
#Build demos
#===============EXAMPLE=========================
...
...
This diff is collapsed.
Click to expand it.
include/vision/factor/factor_pixel_hp.h
+
0
−
6
View file @
1e142f67
...
...
@@ -99,15 +99,9 @@ inline FactorPixelHp::FactorPixelHp(const FeatureBasePtr& _ftr_ptr,
inline
Eigen
::
VectorXd
FactorPixelHp
::
expectation
()
const
{
<<<<<<<
HEAD
FrameBasePtr
frm
=
getFeature
()
->
getCapture
()
->
getFrame
();
SensorBasePtr
sen
=
getFeature
()
->
getCapture
()
->
getSensor
();
LandmarkBasePtr
lmk
=
getLandmarkOther
();
=======
auto
frm
=
getFeature
()
->
getCapture
()
->
getFrame
();
auto
sen
=
getFeature
()
->
getCapture
()
->
getSensor
();
auto
lmk
=
getLandmarkOther
();
>>>>>>>
devel
const
Eigen
::
MatrixXd
frame_pos
=
frm
->
getP
()
->
getState
();
const
Eigen
::
MatrixXd
frame_ori
=
frm
->
getO
()
->
getState
();
...
...
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