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

[ox] Bundle jsoncpp under deps

Browse Source
This commit is contained in:
Gary Talent 2022-03-11 22:30:42 -06:00
parent b96d33bbb9
commit 5a4b539ac1
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/ox/CMakeLists.txt vendored
View File

@ -78,4 +78,6 @@ include_directories("src")
install(FILES OxConfig.cmake DESTINATION lib/ox) install(FILES OxConfig.cmake DESTINATION lib/ox)
include_directories(deps/jsoncpp/include)
add_subdirectory(deps/jsoncpp)
add_subdirectory(src) add_subdirectory(src)

8
deps/ox/deps/jsoncpp/CMakeLists.txt vendored
View File

@ -81,17 +81,17 @@ set(PROJECT_SOVERSION 25)
include(${CMAKE_CURRENT_SOURCE_DIR}/include/PreventInSourceBuilds.cmake) include(${CMAKE_CURRENT_SOURCE_DIR}/include/PreventInSourceBuilds.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/include/PreventInBuildInstalls.cmake) include(${CMAKE_CURRENT_SOURCE_DIR}/include/PreventInBuildInstalls.cmake)
option(JSONCPP_WITH_TESTS "Compile and (for jsoncpp_check) run JsonCpp test executables" ON) option(JSONCPP_WITH_TESTS "Compile and (for jsoncpp_check) run JsonCpp test executables" OFF)
option(JSONCPP_WITH_POST_BUILD_UNITTEST "Automatically run unit-tests as a post build step" ON) option(JSONCPP_WITH_POST_BUILD_UNITTEST "Automatically run unit-tests as a post build step" OFF)
option(JSONCPP_WITH_WARNING_AS_ERROR "Force compilation to fail if a warning occurs" OFF) option(JSONCPP_WITH_WARNING_AS_ERROR "Force compilation to fail if a warning occurs" OFF)
option(JSONCPP_WITH_STRICT_ISO "Issue all the warnings demanded by strict ISO C and ISO C++" ON) option(JSONCPP_WITH_STRICT_ISO "Issue all the warnings demanded by strict ISO C and ISO C++" ON)
option(JSONCPP_WITH_PKGCONFIG_SUPPORT "Generate and install .pc files" ON) option(JSONCPP_WITH_PKGCONFIG_SUPPORT "Generate and install .pc files" ON)
option(JSONCPP_WITH_CMAKE_PACKAGE "Generate and install cmake package files" ON) option(JSONCPP_WITH_CMAKE_PACKAGE "Generate and install cmake package files" ON)
option(JSONCPP_WITH_EXAMPLE "Compile JsonCpp example" OFF) option(JSONCPP_WITH_EXAMPLE "Compile JsonCpp example" OFF)
option(JSONCPP_STATIC_WINDOWS_RUNTIME "Use static (MT/MTd) Windows runtime" OFF) option(JSONCPP_STATIC_WINDOWS_RUNTIME "Use static (MT/MTd) Windows runtime" OFF)
option(BUILD_SHARED_LIBS "Build jsoncpp_lib as a shared library." ON) option(BUILD_SHARED_LIBS "Build jsoncpp_lib as a shared library." OFF)
option(BUILD_STATIC_LIBS "Build jsoncpp_lib as a static library." ON) option(BUILD_STATIC_LIBS "Build jsoncpp_lib as a static library." ON)
option(BUILD_OBJECT_LIBS "Build jsoncpp_lib as a object library." ON) option(BUILD_OBJECT_LIBS "Build jsoncpp_lib as a object library." OFF)
# Adhere to GNU filesystem layout conventions # Adhere to GNU filesystem layout conventions
include(GNUInstallDirs) include(GNUInstallDirs)

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

@ -4,8 +4,6 @@ add_library(
write.cpp write.cpp
) )
find_package(jsoncpp REQUIRED)
if(NOT MSVC) if(NOT MSVC)
target_compile_options(OxOrganicClaw PRIVATE -Wsign-conversion) target_compile_options(OxOrganicClaw PRIVATE -Wsign-conversion)
endif() endif()
@ -13,7 +11,7 @@ endif()
target_link_libraries( target_link_libraries(
OxOrganicClaw PUBLIC OxOrganicClaw PUBLIC
OxModel OxModel
jsoncpp::jsoncpp jsoncpp
) )
set_property( set_property(