From dfc87ef7a48ff83e5adbf1eea8ce524baaff0e66 Mon Sep 17 00:00:00 2001 From: JD Date: Fri, 31 May 2019 12:01:50 -0500 Subject: [PATCH] update the version of nlohmann/json in requirements.txt (#107) * update the version of json in requirements.txt * removed C++ 17 requirement --- CMakeLists.txt | 4 ++-- requirements.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4946f09..c7b0e99 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ option(COVERALLS "Generate coveralls data" OFF) set(INJA_INSTALL_INCLUDE_DIR "include") -set(CMAKE_CXX_STANDARD 17) +# set(CMAKE_CXX_STANDARD 17) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake) set(CMAKE_BUILD_TYPE Debug) # set(CMAKE_BUILD_TYPE Release) @@ -36,7 +36,7 @@ target_include_directories(inja INTERFACE $ ) -target_compile_features(inja INTERFACE cxx_std_11) +# target_compile_features(inja INTERFACE cxx_std_11) set(INJA_PACKAGE_USE_EMBEDDED_JSON OFF) diff --git a/requirements.txt b/requirements.txt index e42faaa..fd4c518 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -nlohmann/json@v3.5.0 +nlohmann/json@v3.6.1