File tree Expand file tree Collapse file tree 4 files changed +14
-6
lines changed Expand file tree Collapse file tree 4 files changed +14
-6
lines changed Original file line number Diff line number Diff line change @@ -19,6 +19,8 @@ find_package(tesseract_environment REQUIRED)
1919find_package (tesseract_visualization REQUIRED)
2020if (NOT TARGET JsonCpp::JsonCpp)
2121 find_package (jsoncpp REQUIRED)
22+ elseif (NOT TARGET jsoncpp_lib)
23+ add_library (jsoncpp_lib ALIAS JsonCpp::JsonCpp)
2224endif ()
2325find_package (ros_industrial_cmake_boilerplate REQUIRED)
2426
Original file line number Diff line number Diff line change @@ -7,17 +7,19 @@ set_and_check(@PROJECT_NAME@_LIBRARY_DIRS "${PACKAGE_PREFIX_DIR}/lib")
77include (CMakeFindDependencyMacro)
88find_dependency(Eigen3)
99if (${CMAKE_VERSION} VERSION_LESS "3.15.0" )
10- find_package (Boost REQUIRED)
10+ find_package (Boost REQUIRED)
1111else ()
12- find_dependency(Boost)
12+ find_dependency(Boost)
1313endif ()
1414find_dependency(console_bridge)
1515find_dependency(trajopt_sco)
1616find_dependency(trajopt_utils)
1717find_dependency(tesseract_environment)
1818find_dependency(tesseract_visualization)
1919if (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)
2123endif ()
2224
2325if (NOT TARGET console_bridge::console_bridge)
Original file line number Diff line number Diff line change @@ -18,6 +18,8 @@ find_package(Eigen3 REQUIRED)
1818find_package (trajopt_utils REQUIRED)
1919if (NOT TARGET JsonCpp::JsonCpp)
2020 find_package (jsoncpp REQUIRED)
21+ elseif (NOT TARGET jsoncpp_lib)
22+ add_library (jsoncpp_lib ALIAS JsonCpp::JsonCpp)
2123endif ()
2224find_package (ros_industrial_cmake_boilerplate REQUIRED)
2325find_package (Boost REQUIRED)
Original file line number Diff line number Diff line change @@ -10,12 +10,14 @@ include(CMakeFindDependencyMacro)
1010find_dependency(Eigen3)
1111find_dependency(trajopt_utils)
1212if (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)
1416endif ()
1517if (${CMAKE_VERSION} VERSION_LESS "3.15.0" )
16- find_package (Boost REQUIRED)
18+ find_package (Boost REQUIRED)
1719else ()
18- find_dependency(Boost)
20+ find_dependency(Boost)
1921endif ()
2022
2123include (
"${CMAKE_CURRENT_LIST_DIR} /@[email protected] " )
You can’t perform that action at this time.
0 commit comments