Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add dependency : google-glog. But, install it using glog_catkin instead ... #63

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add dependency : google-glog. But, install it using glog_catkin instead ... #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,8 @@ You are welcome contributing to the package by opening a pull-request:
Please make yourself familiar with the Google c++ style guide:
http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml

## Dependencies
glog_catkin: https://github.com/ethz-asl/glog_catkin

##License
The source code is released under the Apache 2.0 license
8 changes: 4 additions & 4 deletions msf_core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ catkin_package(
DEPENDS eigen GLog
CATKIN_DEPENDS roscpp sensor_msgs dynamic_reconfigure msf_timing tf
INCLUDE_DIRS include ${Eigen_INCLUDE_DIRS}
LIBRARIES msf_core similaritytransform ${GLOG_LIBRARY}
LIBRARIES msf_core similaritytransform ${glog_catkin_LIBRARIES}
CFG_EXTRAS export_flags.cmake
)

Expand All @@ -53,14 +53,14 @@ install(DIRECTORY cmake
add_library(${PROJECT_NAME} src/lib/msf_tools.cc src/lib/falsecolor.cc
src/lib/gps_conversion.cc)
target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES})
add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_gencfg ${MSF_DOCUMENTATION})
add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_gencfg ${MSF_DOCUMENTATION} glog_catkin)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this does not look right.


add_library(similaritytransform src/similaritytransform.cc)
target_link_libraries(similaritytransform ${catkin_LIBRARIES})
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

link to glog here to fix the build


catkin_add_gtest(test_similaritytransform src/test/test_similaritytransform.cc)
target_link_libraries(test_similaritytransform similaritytransform ${GLOG_LIBRARY})
target_link_libraries(test_similaritytransform similaritytransform ${glog_catkin_LIBRARIES})
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will then not need to link here and below


catkin_add_gtest(test_static_statelist src/test/test_staticstatelist.cc)
target_link_libraries(test_static_statelist pthread ${PROJECT_NAME} ${GLOG_LIBRARY})
target_link_libraries(test_static_statelist pthread ${PROJECT_NAME} ${glog_catkin_LIBRARIES})