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

fix: dvo_benchmark required dependency of dynamic-reconfigure #48

Open
wants to merge 2 commits into
base: kinetic-devel
Choose a base branch
from
Open

fix: dvo_benchmark required dependency of dynamic-reconfigure #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5de516
fix: dvo_benchmark required dependency of dynamic-reconfigure
kpykc Sep 21, 2016
6962216
fix: temporary fix for cmake g2o paths
kpykc Sep 21, 2016
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
2 changes: 1 addition & 1 deletion dvo_benchmark/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ project(dvo_benchmark)

LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake_modules")

find_package(catkin REQUIRED COMPONENTS roscpp dvo_core dvo_ros dvo_slam cv_bridge)
find_package(catkin REQUIRED COMPONENTS roscpp dvo_core dvo_ros dvo_slam cv_bridge dynamic_reconfigure)
find_package(cmake_modules REQUIRED)
find_package(Eigen3 REQUIRED)
find_package(G2O REQUIRED)
Expand Down
8 changes: 5 additions & 3 deletions dvo_benchmark/cmake_modules/FindG2O.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ FIND_PATH(G2O_INCLUDE_DIR g2o/core/base_vertex.h
/opt/local/include
/sw/local/include
/sw/include
/opt/ros/kinetic/include # temp hack
NO_DEFAULT_PATH
)

Expand Down Expand Up @@ -41,7 +42,7 @@ MACRO(FIND_G2O_LIBRARY MYLIBRARY MYLIBRARYNAME)
/sw/local/lib
/sw/lib
)

FIND_LIBRARY(${MYLIBRARY}
NAMES "g2o_${MYLIBRARYNAME}"
PATHS
Expand All @@ -64,14 +65,15 @@ MACRO(FIND_G2O_LIBRARY MYLIBRARY MYLIBRARYNAME)
/opt/local/lib
/sw/local/lib
/sw/lib
/opt/ros/kinetic/lib/ # temp hack
)

IF(NOT ${MYLIBRARY}_DEBUG)
IF(MYLIBRARY)
SET(${MYLIBRARY}_DEBUG ${MYLIBRARY})
ENDIF(MYLIBRARY)
ENDIF( NOT ${MYLIBRARY}_DEBUG)

ENDMACRO(FIND_G2O_LIBRARY LIBRARY LIBRARYNAME)

# Find the core elements
Expand Down
4 changes: 3 additions & 1 deletion dvo_benchmark/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,16 @@

<build_depend>cmake_modules</build_depend>

<build_depend>dynamic-reconfigure</build_depend>

<build_depend>libpcl-all-dev</build_depend>
<build_depend>cv_bridge</build_depend>
<build_depend>roscpp</build_depend>

<build_depend>dvo_core</build_depend>
<build_depend>dvo_ros</build_depend>
<build_depend>dvo_slam</build_depend>

<run_depend>libpcl-all</run_depend>
<run_depend>cv_bridge</run_depend>
<run_depend>roscpp</run_depend>
Expand Down
8 changes: 5 additions & 3 deletions dvo_slam/cmake_modules/FindG2O.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ FIND_PATH(G2O_INCLUDE_DIR g2o/core/base_vertex.h
/opt/local/include
/sw/local/include
/sw/include
/opt/ros/kinetic/include # temp hack
NO_DEFAULT_PATH
)

Expand Down Expand Up @@ -41,7 +42,7 @@ MACRO(FIND_G2O_LIBRARY MYLIBRARY MYLIBRARYNAME)
/sw/local/lib
/sw/lib
)

FIND_LIBRARY(${MYLIBRARY}
NAMES "g2o_${MYLIBRARYNAME}"
PATHS
Expand All @@ -64,14 +65,15 @@ MACRO(FIND_G2O_LIBRARY MYLIBRARY MYLIBRARYNAME)
/opt/local/lib
/sw/local/lib
/sw/lib
/opt/ros/kinetic/lib/ # temp hack
)

IF(NOT ${MYLIBRARY}_DEBUG)
IF(MYLIBRARY)
SET(${MYLIBRARY}_DEBUG ${MYLIBRARY})
ENDIF(MYLIBRARY)
ENDIF( NOT ${MYLIBRARY}_DEBUG)

ENDMACRO(FIND_G2O_LIBRARY LIBRARY LIBRARYNAME)

# Find the core elements
Expand Down