Skip to content

Commit

Permalink
Remove dependency on catkin
Browse files Browse the repository at this point in the history
  • Loading branch information
tmigimatsu committed Sep 23, 2020
1 parent 9ff4960 commit d4c146d
Showing 1 changed file with 17 additions and 13 deletions.
30 changes: 17 additions & 13 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,16 @@ include(${fl_MODULE_PATH}/definitions.cmake)
############################
# Dependencies ##
############################
find_package(Eigen REQUIRED)
include_directories(${Eigen_INCLUDE_DIRS})
add_definitions(${Eigen_DEFINITIONS})
if(NOT TARGET Eigen3::Eigen)
find_package(Eigen REQUIRED)
include_directories(${Eigen_INCLUDE_DIRS})
add_definitions(${Eigen_DEFINITIONS})
else()
get_target_property(EIGEN3_INCLUDE_DIR Eigen3::Eigen
INTERFACE_INCLUDE_DIRECTORIES)
endif()

find_package(Boost REQUIRED)
include_directories(${Boost_INCLUDE_DIRS})

#find_package(OpenMP)
#if(OPENMP_FOUND)
Expand All @@ -67,16 +71,16 @@ include_directories(${Boost_INCLUDE_DIRS})
############################
## catkin #
############################
if(fl_USE_CATKIN)
find_package(catkin REQUIRED)
endif(fl_USE_CATKIN)
# if(fl_USE_CATKIN)
# find_package(catkin REQUIRED)
# endif(fl_USE_CATKIN)

if(catkin_FOUND AND fl_USE_CATKIN)
set(fl_USING_CATKIN YES)
catkin_package(INCLUDE_DIRS include DEPENDS Eigen Boost)
else(catkin_FOUND AND fl_USE_CATKIN)
set(fl_USING_CATKIN NO)
endif(catkin_FOUND AND fl_USE_CATKIN)
# if(catkin_FOUND AND fl_USE_CATKIN)
# set(fl_USING_CATKIN YES)
# catkin_package(INCLUDE_DIRS include DEPENDS Eigen Boost)
# else(catkin_FOUND AND fl_USE_CATKIN)
# set(fl_USING_CATKIN NO)
# endif(catkin_FOUND AND fl_USE_CATKIN)

############################
# Documentation Generation #
Expand Down

0 comments on commit d4c146d

Please sign in to comment.