drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 7 Pull Requests Actions Releases 9 Activity

[ox] Fix jsoncpp include path export

Browse Source
This commit is contained in:
Gary Talent 2022-03-12 02:34:04 -06:00
parent f910961111
commit 41cc78db66
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deps/ox/CMakeLists.txt vendored
View File

@ -74,12 +74,12 @@ endif()
enable_testing() enable_testing()
include_directories("src") include_directories(src)
install(FILES OxConfig.cmake DESTINATION lib/ox) install(FILES OxConfig.cmake DESTINATION lib/ox)
if(OX_USE_STDLIB) if(OX_USE_STDLIB)
include_directories(deps/jsoncpp/include) set(JSONCPP_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/deps/jsoncpp/include")
add_subdirectory(deps/jsoncpp) add_subdirectory(deps/jsoncpp)
endif() endif()
add_subdirectory(src) add_subdirectory(src)

7
deps/ox/src/ox/oc/CMakeLists.txt vendored
View File

@ -11,7 +11,12 @@ endif()
target_link_libraries( target_link_libraries(
OxOrganicClaw PUBLIC OxOrganicClaw PUBLIC
OxModel OxModel
jsoncpp jsoncpp_object
)
target_include_directories(
OxOrganicClaw PUBLIC
${JSONCPP_INCLUDE_DIR}
) )
set_property( set_property(