From 41cc78db6616f2b5adf66bc2febcf40cb716fc05 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Sat, 12 Mar 2022 02:34:04 -0600 Subject: [PATCH] [ox] Fix jsoncpp include path export --- deps/ox/CMakeLists.txt | 4 ++-- deps/ox/src/ox/oc/CMakeLists.txt | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/deps/ox/CMakeLists.txt b/deps/ox/CMakeLists.txt index da8934e47..a00e462a9 100644 --- a/deps/ox/CMakeLists.txt +++ b/deps/ox/CMakeLists.txt @@ -74,12 +74,12 @@ endif() enable_testing() -include_directories("src") +include_directories(src) install(FILES OxConfig.cmake DESTINATION lib/ox) if(OX_USE_STDLIB) - include_directories(deps/jsoncpp/include) + set(JSONCPP_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/deps/jsoncpp/include") add_subdirectory(deps/jsoncpp) endif() add_subdirectory(src) diff --git a/deps/ox/src/ox/oc/CMakeLists.txt b/deps/ox/src/ox/oc/CMakeLists.txt index 66d459a8b..b428ae2ac 100644 --- a/deps/ox/src/ox/oc/CMakeLists.txt +++ b/deps/ox/src/ox/oc/CMakeLists.txt @@ -11,7 +11,12 @@ endif() target_link_libraries( OxOrganicClaw PUBLIC OxModel - jsoncpp + jsoncpp_object +) + +target_include_directories( + OxOrganicClaw PUBLIC + ${JSONCPP_INCLUDE_DIR} ) set_property(