Skip to content

Commit

Permalink
Should fix errors on build server regarding Eigen3 and visualization_…
Browse files Browse the repository at this point in the history 
…msgs dependencies.
  • Loading branch information
Peter Fankhauser committed Jan 11, 2016
1 parent 9559475 commit 3071051
Show file tree
Hide file tree
Showing 10 changed files with 10 additions and 44 deletions.
12 changes: 4 additions & 8 deletions grid_map/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,11 @@ find_package(catkin REQUIRED COMPONENTS
geometry_msgs
cv_bridge
rosbag
visualization_msgs
)

## System dependencies are found with CMake's conventions
#find_package(Eigen3 REQUIRED)
# Solution to find Eigen3 with Saucy.
find_package(Eigen3 QUIET)
if(NOT EIGEN3_FOUND)
find_package(PkgConfig REQUIRED)
pkg_check_modules(EIGEN3 REQUIRED eigen3)
set(EIGEN3_INCLUDE_DIR ${EIGEN3_INCLUDE_DIRS})
endif()

###################################
## catkin specific configuration ##
Expand All @@ -48,8 +42,10 @@ catkin_package(
nav_msgs
std_msgs
geometry_msgs
cv_bridge
visualization_msgs
DEPENDS
Eigen3
#Eigen3
)

###########
Expand Down
2 changes: 1 addition & 1 deletion grid_map/include/grid_map/GridMapRosConverter.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#pragma once

#include "grid_map_core/TypeDefs.hpp"
#include <grid_map_core/TypeDefs.hpp>
#include <grid_map_core/GridMap.hpp>
#include <grid_map_msgs/GridMap.h>

Expand Down
3 changes: 2 additions & 1 deletion grid_map/package.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<depend>nav_msgs</depend>
<depend>std_msgs</depend>
<depend>geometry_msgs</depend>
<depend>rosbag</depend>
<depend>cv_bridge</depend>
<depend>rosbag</depend>
<depend>visualization_msgs</depend>
</package>
3 changes: 2 additions & 1 deletion grid_map_core/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,12 @@ endif()
catkin_package(
INCLUDE_DIRS
include
${EIGEN3_INCLUDE_DIR}
LIBRARIES
${PROJECT_NAME}
CATKIN_DEPENDS
DEPENDS
Eigen3
#Eigen3
)

###########
Expand Down
7 changes: 0 additions & 7 deletions grid_map_demos/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,6 @@ find_package(catkin REQUIRED COMPONENTS

## System dependencies are found with CMake's conventions
#find_package(Eigen3 REQUIRED)
# Solution to find Eigen3 with Saucy.
find_package(Eigen3 QUIET)
if(NOT EIGEN3_FOUND)
find_package(PkgConfig REQUIRED)
pkg_check_modules(EIGEN3 REQUIRED eigen3)
set(EIGEN3_INCLUDE_DIR ${EIGEN3_INCLUDE_DIRS})
endif()

###################################
## catkin specific configuration ##
Expand Down
9 changes: 1 addition & 8 deletions grid_map_filters/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,6 @@ find_package(catkin REQUIRED COMPONENTS

## System dependencies are found with CMake's conventions
#find_package(Eigen3 REQUIRED)
# Solution to find Eigen3 with Saucy.
find_package(Eigen3 QUIET)
if(NOT EIGEN3_FOUND)
find_package(PkgConfig REQUIRED)
pkg_check_modules(EIGEN3 REQUIRED eigen3)
set(EIGEN3_INCLUDE_DIR ${EIGEN3_INCLUDE_DIRS})
endif()

###################################
## catkin specific configuration ##
Expand All @@ -41,7 +34,7 @@ catkin_package(
grid_map_msgs
filters
DEPENDS
Eigen3
#Eigen3
)

###########
Expand Down
7 changes: 0 additions & 7 deletions grid_map_loader/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,6 @@ find_package(catkin REQUIRED COMPONENTS

## System dependencies are found with CMake's conventions
#find_package(Eigen3 REQUIRED)
# Solution to find Eigen3 with Saucy.
find_package(Eigen3 QUIET)
if(NOT EIGEN3_FOUND)
find_package(PkgConfig REQUIRED)
pkg_check_modules(EIGEN3 REQUIRED eigen3)
set(EIGEN3_INCLUDE_DIR ${EIGEN3_INCLUDE_DIRS})
endif()

###################################
## catkin specific configuration ##
Expand Down
1 change: 0 additions & 1 deletion grid_map_msgs/package.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
<url type="bugtracker">http://github.com/ethz-asl/grid_map/issues</url>
<author email="[email protected]">Péter Fankhauser</author>
<buildtool_depend>catkin</buildtool_depend>
<depend>cmake_modules</depend>
<depend>roscpp</depend>
<depend>message_generation</depend>
<depend>std_msgs</depend>
Expand Down
9 changes: 0 additions & 9 deletions grid_map_visualization/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,10 @@ find_package(catkin REQUIRED COMPONENTS
visualization_msgs
sensor_msgs
nav_msgs
sensor_msgs
)

## System dependencies are found with CMake's conventions
#find_package(Eigen3 REQUIRED)
# Solution to find Eigen3 with Saucy.
find_package(Eigen3 QUIET)
if(NOT EIGEN3_FOUND)
find_package(PkgConfig REQUIRED)
pkg_check_modules(EIGEN3 REQUIRED eigen3)
set(EIGEN3_INCLUDE_DIR ${EIGEN3_INCLUDE_DIRS})
endif()

###################################
## catkin specific configuration ##
Expand All @@ -48,7 +40,6 @@ catkin_package(
visualization_msgs
sensor_msgs
nav_msgs
sensor_msgs
)

###########
Expand Down
1 change: 0 additions & 1 deletion grid_map_visualization/package.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
<url type="bugtracker">http://github.com/ethz-asl/grid_map/issues</url>
<author email="[email protected]">Péter Fankhauser</author>
<buildtool_depend>catkin</buildtool_depend>
<depend>cmake_modules</depend>
<depend>roscpp</depend>
<depend>grid_map_core</depend>
<depend>grid_map</depend>
Expand Down

0 comments on commit 3071051

Please sign in to comment.