Skip to content

Json issue fixed #29

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

Merged
ajanani85 merged 3 commits into from
Apr 29, 2020
Merged

Json issue fixed #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
da0e1b9
Jsoncpp is added to the library
ajanani85 Apr 28, 2020
b5ef646
Merge branch 'master' into json_issue_fixed
ajanani85 Apr 28, 2020
d6bf7db
Merge branch 'master' into json_issue_fixed
ajanani85 Apr 29, 2020
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
12 changes: 8 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,12 @@ find_package(catkin REQUIRED COMPONENTS
find_package(OpenCV REQUIRED)
find_package(Eigen3 REQUIRED)

find_package(PkgConfig REQUIRED)
pkg_check_modules(jsoncpp REQUIRED jsoncpp)

catkin_package(
INCLUDE_DIRS include include/am_utils include/vb_util_lib
LIBRARIES am_utils
INCLUDE_DIRS include include/am_utils include/vb_util_lib ${jsoncpp_INCLUDE_DIRS}
LIBRARIES am_utils jsoncpp
CATKIN_DEPENDS
brain_box_msgs
control_toolbox
Expand All @@ -50,6 +53,7 @@ include_directories(
include
${catkin_INCLUDE_DIRS}
${Eigen3_INCLUDE_DIRS}
${jsoncpp_INCLUDE_DIRS}
/usr/include/eigen3
)

Expand All @@ -74,7 +78,7 @@ add_library(am_utils
src/vb_util_lib/am_param.cpp
src/vb_util_lib/gis_entity.cpp
src/vb_util_lib/gis_util.cpp
src/vb_util_lib/jsoncpp.cpp
#src/vb_util_lib/jsoncpp.cpp
src/vb_util_lib/json_utils.cpp
src/vb_util_lib/gs_json_utils.cpp
src/vb_util_lib/am_util.cpp
Expand Down Expand Up @@ -109,7 +113,7 @@ add_library(am_utils
src/vb_util_lib/vb_main.cpp
src/vb_util_lib/bag_logger.cpp)

target_link_libraries(am_utils ${catkin_LIBRARIES} ${OpenCV_LIBRARIES})
target_link_libraries(am_utils ${catkin_LIBRARIES} ${OpenCV_LIBRARIES} jsoncpp)

add_dependencies(am_utils ${catkin_EXPORTED_TARGETS})

Expand Down
Loading