Skip to content

Commit bf48427

Browse files
authored
Fix jsoncpp link targets and sparseview issue (#299)
1 parent 5604037 commit bf48427

File tree

4 files changed

+14
-6
lines changed

4 files changed

+14
-6
lines changed

trajopt/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ find_package(tesseract_environment REQUIRED)
1919
find_package(tesseract_visualization REQUIRED)
2020
if(NOT TARGET JsonCpp::JsonCpp)
2121
find_package(jsoncpp REQUIRED)
22+
elseif(NOT TARGET jsoncpp_lib)
23+
add_library(jsoncpp_lib ALIAS JsonCpp::JsonCpp)
2224
endif()
2325
find_package(ros_industrial_cmake_boilerplate REQUIRED)
2426

trajopt/cmake/trajopt-config.cmake.in

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,19 @@ set_and_check(@PROJECT_NAME@_LIBRARY_DIRS "${PACKAGE_PREFIX_DIR}/lib")
77
include(CMakeFindDependencyMacro)
88
find_dependency(Eigen3)
99
if(${CMAKE_VERSION} VERSION_LESS "3.15.0")
10-
find_package(Boost REQUIRED)
10+
find_package(Boost REQUIRED)
1111
else()
12-
find_dependency(Boost)
12+
find_dependency(Boost)
1313
endif()
1414
find_dependency(console_bridge)
1515
find_dependency(trajopt_sco)
1616
find_dependency(trajopt_utils)
1717
find_dependency(tesseract_environment)
1818
find_dependency(tesseract_visualization)
1919
if(NOT TARGET JsonCpp::JsonCpp)
20-
find_dependency(jsoncpp)
20+
find_dependency(jsoncpp)
21+
elseif(NOT TARGET jsoncpp_lib)
22+
add_library(jsoncpp_lib ALIAS JsonCpp::JsonCpp)
2123
endif()
2224

2325
if(NOT TARGET console_bridge::console_bridge)

trajopt_sco/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ find_package(Eigen3 REQUIRED)
1818
find_package(trajopt_utils REQUIRED)
1919
if(NOT TARGET JsonCpp::JsonCpp)
2020
find_package(jsoncpp REQUIRED)
21+
elseif(NOT TARGET jsoncpp_lib)
22+
add_library(jsoncpp_lib ALIAS JsonCpp::JsonCpp)
2123
endif()
2224
find_package(ros_industrial_cmake_boilerplate REQUIRED)
2325
find_package(Boost REQUIRED)

trajopt_sco/cmake/trajopt_sco-config.cmake.in

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,14 @@ include(CMakeFindDependencyMacro)
1010
find_dependency(Eigen3)
1111
find_dependency(trajopt_utils)
1212
if(NOT TARGET JsonCpp::JsonCpp)
13-
find_dependency(jsoncpp)
13+
find_dependency(jsoncpp)
14+
elseif(NOT TARGET jsoncpp_lib)
15+
add_library(jsoncpp_lib ALIAS JsonCpp::JsonCpp)
1416
endif()
1517
if(${CMAKE_VERSION} VERSION_LESS "3.15.0")
16-
find_package(Boost REQUIRED)
18+
find_package(Boost REQUIRED)
1719
else()
18-
find_dependency(Boost)
20+
find_dependency(Boost)
1921
endif()
2022

2123
include("${CMAKE_CURRENT_LIST_DIR}/@[email protected]")

0 commit comments

Comments
 (0)