generic-library/valijson
1
0
Fork 0
mirror of https://github.com/tristanpenman/valijson.git synced 2024-12-12 10:13:51 +01:00
Code Issues Projects Releases Wiki Activity

Make Boost a truly optional dependency

Browse Source
This commit is contained in:
Tristan Penman 2019-08-20 11:18:58 +10:00
parent 56fb36dff9
commit 1844241d2a
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
CMakeLists.txt
View File

@ -3,9 +3,10 @@ project(valijson)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
option(valijson_INSTALL_HEADERS "Install valijson Headers." FALSE)
option(valijson_BUILD_EXAMPLES "Build valijson Examples." FALSE)
option(valijson_BUILD_TESTS "Build valijson Tests." TRUE)
option(valijson_INSTALL_HEADERS "Install valijson headers." FALSE)
option(valijson_BUILD_EXAMPLES "Build valijson examples." FALSE)
option(valijson_BUILD_TESTS "Build valijson test suite." TRUE)
option(valijson_EXCLUDE_BOOST "Exclude Boost when building test suite." FALSE)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
@ -61,12 +62,8 @@ include_directories(include SYSTEM
)
if(valijson_BUILD_TESTS)
find_package(Boost 1.54.0 REQUIRED)
if(Boost_FOUND)
add_definitions(-DBOOST_ALL_DYN_LINK)
set(Boost_USE_STATIC_LIBS OFF)
set(Boost_USE_MULTITHREADED ON)
set(Boost_USE_STATIC_RUNTIME OFF)
if(NOT valijson_EXCLUDE_BOOST)
find_package(Boost 1.54.0)
endif()
# Build local gtest
@ -80,7 +77,6 @@ if(valijson_BUILD_TESTS)
tests/test_json11_adapter.cpp
tests/test_jsoncpp_adapter.cpp
tests/test_nlohmann_json_adapter.cpp
tests/test_property_tree_adapter.cpp
tests/test_rapidjson_adapter.cpp
tests/test_picojson_adapter.cpp
tests/test_poco_json_adapter.cpp
@ -93,6 +89,10 @@ if(valijson_BUILD_TESTS)
list(APPEND TEST_SOURCES tests/test_qtjson_adapter.cpp)
endif()
if(Boost_FOUND)
list(APPEND TEST_SOURCES tests/test_property_tree_adapter.cpp)
endif()
# Unit tests executable
add_executable(test_suite ${TEST_SOURCES})
@ -101,6 +101,13 @@ if(valijson_BUILD_TESTS)
set(TEST_LIBS gtest gtest_main jsoncpp json11)
if(Boost_FOUND)
add_definitions(-DBOOST_ALL_DYN_LINK)
set(Boost_USE_STATIC_LIBS OFF)
set(Boost_USE_MULTITHREADED ON)
set(Boost_USE_STATIC_RUNTIME OFF)
endif()
if(Qt5Core_FOUND)
list(APPEND TEST_LIBS Qt5::Core)
target_compile_definitions(test_suite PRIVATE "VALIJSON_BUILD_QT_ADAPTERS")

2
README.md
View File

@ -162,6 +162,8 @@ Doxygen documentation can be built by running 'doxygen' from the project root di
Valijson requires a compiler with C++11 support.
When building the test suite, Boost 1.54, Qt 5 and Poco are optional dependencies.
## Supported Parsers ##
Valijson supports JSON documents loaded using various JSON parser libraries. It has been tested against the following versions of these libraries: