diff --git a/CMakeLists.txt b/CMakeLists.txt index 22408ff66..6e08519e9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,8 +32,10 @@ set(NLOHMANN_JSON_CMAKE_PROJECT_CONFIG_FILE "${NLOHMANN_JSON_CMAKE_CONFIG_DIR}/$ if (JSON_MultipleHeaders) set(NLOHMANN_JSON_INCLUDE_BUILD_DIR "${PROJECT_SOURCE_DIR}/include/") + message(STATUS "Using the multi-header code from ${NLOHMANN_JSON_INCLUDE_BUILD_DIR}") else() set(NLOHMANN_JSON_INCLUDE_BUILD_DIR "${PROJECT_SOURCE_DIR}/single_include/") + message(STATUS "Using the single-header code from ${NLOHMANN_JSON_INCLUDE_BUILD_DIR}") endif() ## diff --git a/Makefile b/Makefile index 1cfa5101b..18a5bdb32 100644 --- a/Makefile +++ b/Makefile @@ -50,6 +50,7 @@ all: @echo "pedantic_clang - run Clang with maximal warning flags" @echo "pedantic_gcc - run GCC with maximal warning flags" @echo "pretty - beautify code with Artistic Style" + @echo "run_benchmarks - build and run benchmarks" ########################################################################## # unit tests @@ -70,7 +71,7 @@ check-fast: clean: rm -fr json_unit json_benchmarks fuzz fuzz-testing *.dSYM test/*.dSYM rm -fr benchmarks/files/numbers/*.json - rm -fr build_coverage + rm -fr build_coverage build_benchmarks $(MAKE) clean -Cdoc $(MAKE) clean -Ctest @@ -188,6 +189,16 @@ pedantic_gcc: -Wuseless-cast \ -Wvariadic-macros" +########################################################################## +# benchmarks +########################################################################## + +run_benchmarks: + mkdir build_benchmarks + cd build_benchmarks ; cmake ../benchmarks + cd build_benchmarks ; make + cd build_benchmarks ; ./json_benchmarks + ########################################################################## # fuzzing ##########################################################################