diff --git a/deps/ox/CMakeLists.txt b/deps/ox/CMakeLists.txt index da8934e4..a00e462a 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 66d459a8..b428ae2a 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(