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

Fixed build issues #2

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

Fixed build issues #2

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
10 changes: 6 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,12 @@ find_package(catkin REQUIRED COMPONENTS
cmake_modules
${OPENCV_PACKAGE}
ceres_catkin
eigen_catkin
# eigen_catkin # @volkbay: modified for eigen3v3.4
glog_catkin
)

find_package(Eigen3 REQUIRED)
find_package(Eigen3 3.4 CONFIG REQUIRED) # @volkbay: modified for eigen3v3.4
set(EIGEN3_INCLUDE_DIR "${Eigen3_DIR}/../../../include/eigen3/") # @volkbay: modified for eigen3v3.4
#message("Eigen version: ${Eigen3_VERSION}")
find_package(easy_profiler_catkin REQUIRED)

Expand Down Expand Up @@ -112,7 +113,7 @@ set(EIGEN3_LIBRARIES ${EIGEN3_LIBRARIES})
# Configure this package
catkin_package(
DEPENDS EIGEN3
INCLUDE_DIRS include ${EIGEN3_INCLUDE_DIR} ${ceres_catkin_INCLUDE_DIRS} ${glog_catkin_INCLUDE_DIRS}
INCLUDE_DIRS include ${EIGEN3_INCLUDE_DIRS} ${ceres_catkin_INCLUDE_DIRS} ${glog_catkin_INCLUDE_DIRS}
LIBRARIES x
)

Expand All @@ -125,7 +126,7 @@ include_directories (include)
include_directories (SYSTEM
${OpenCV_INCLUDE_DIRS}
${catkin_INCLUDE_DIRS}
${EIGEN3_INCLUDE_DIR}
# ${EIGEN3_INCLUDE_DIR} # @volkbay: modified for eigen3v3.4
${easy_profiler_catkin_INCLUDE_DIRS}
${glog_catkin_INCLUDE_DIRS}
)
Expand Down Expand Up @@ -177,4 +178,5 @@ target_link_libraries(x
${OpenCV_LIBRARIES}
${catkin_LIBRARIES}
${easy_profiler_catkin_LIBRARIES}
Eigen3::Eigen # @volkbay: modified for eigen3v3.4
)
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 @@ -3,3 +3,6 @@
Generic C++ library for vision-based navigation, with multi-sensor fusion capabilities for thermal, range, solar and GPS measurements.

See the [xWiki](https://github.com/jpl-x/x/wiki) for more information about [x](https://github.com/jpl-x/x/wiki/the-x-Library).

>**Note**
> This particular X Library (for event-based vision) uses [Haste Library](https://github.com/ialzugaray/haste), so Eigen3 version should be >= v3.4.
4 changes: 2 additions & 2 deletions dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
repositories:
easy_profiler_catkin:
type: git
url: [email protected]:x/x_external/x_easy_profiler_catkin.git
url: git@github.com:florian-world/x_easy_profiler_catkin # @volkbay: fornat1.jpl.nasa.gov cannot be reached
version: master
eigen_catkin:
type: git
url: [email protected]:x/x_external/x_eigen_catkin.git
url: git@github.com:ethz-asl/eigen_catkin # @volkbay: fornat1.jpl.nasa.gov cannot be reached
version: master
ceres_catkin:
type: git
Expand Down