From 73cc5089e33ea950b6677e19ee7ec656c9bcf985 Mon Sep 17 00:00:00 2001 From: Kevin Tonon Date: Tue, 27 Mar 2018 12:51:30 -0400 Subject: [PATCH 1/5] Using target_compile_features to specify C++ 11 standard --- CMakeLists.txt | 4 +++- benchmarks/CMakeLists.txt | 5 +++-- test/CMakeLists.txt | 8 +++----- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c0acc750b..958a129fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0.0) +cmake_minimum_required(VERSION 3.8) ## ## PROJECT @@ -44,6 +44,8 @@ endif() ## add_library(${NLOHMANN_JSON_TARGET_NAME} INTERFACE) +target_compile_features(${NLOHMANN_JSON_TARGET_NAME} INTERFACE cxx_std_11) + target_include_directories( ${NLOHMANN_JSON_TARGET_NAME} INTERFACE diff --git a/benchmarks/CMakeLists.txt b/benchmarks/CMakeLists.txt index c10d44e96..a53812c10 100644 --- a/benchmarks/CMakeLists.txt +++ b/benchmarks/CMakeLists.txt @@ -1,9 +1,9 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.8) project(JSON_Benchmarks LANGUAGES CXX) # set compiler flags if((CMAKE_CXX_COMPILER_ID MATCHES GNU) OR (CMAKE_CXX_COMPILER_ID MATCHES Clang)) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -flto -DNDEBUG -O3") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto -DNDEBUG -O3") endif() # configure Google Benchmarks @@ -23,4 +23,5 @@ file(COPY ${CMAKE_SOURCE_DIR}/../test/data/regression/floats.json # benchmark binary add_executable(json_benchmarks src/benchmarks.cpp) +target_compile_features(json_benchmarks PRIVATE cxx_std_11) target_link_libraries(json_benchmarks benchmark ${CMAKE_THREAD_LIBS_INIT}) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index e5f6dc55a..c49150ad6 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -6,7 +6,7 @@ option(JSON_Coverage "Build test suite with coverage information" OFF) if(JSON_Sanitizer) message(STATUS "Building test suite with Clang sanitizer") if(NOT MSVC) - set(CMAKE_CXX_FLAGS "-std=c++11 -g -O2 -fsanitize=address -fsanitize=undefined -fno-omit-frame-pointer") + set(CMAKE_CXX_FLAGS "-g -O2 -fsanitize=address -fsanitize=undefined -fno-omit-frame-pointer") endif() endif() @@ -62,11 +62,10 @@ add_library(catch_main OBJECT "src/unit.cpp" ) set_target_properties(catch_main PROPERTIES - CXX_STANDARD 11 - CXX_STANDARD_REQUIRED ON COMPILE_DEFINITIONS "$<$:_SCL_SECURE_NO_WARNINGS>" COMPILE_OPTIONS "$<$:/EHsc;$<$:/Od>>" ) +target_compile_features(catch_main PUBLIC cxx_std_11) target_include_directories(catch_main PRIVATE "thirdparty/catch") # https://stackoverflow.com/questions/2368811/how-to-set-warning-level-in-cmake @@ -96,13 +95,12 @@ foreach(file ${files}) add_executable(${testcase} $ ${file}) set_target_properties(${testcase} PROPERTIES - CXX_STANDARD 11 - CXX_STANDARD_REQUIRED ON COMPILE_DEFINITIONS "$<$:_SCL_SECURE_NO_WARNINGS>" COMPILE_OPTIONS "$<$:/EHsc;$<$:/Od>>" ) target_compile_definitions(${testcase} PRIVATE CATCH_CONFIG_FAST_COMPILE) + target_compile_features(${testcase} PRIVATE cxx_std_11) target_include_directories(${testcase} PRIVATE "thirdparty/catch") target_include_directories(${testcase} PRIVATE "thirdparty/fifo_map") target_include_directories(${testcase} PRIVATE ${NLOHMANN_JSON_INCLUDE_BUILD_DIR}) From 830c93fd09aa5c30e42bc6918ecc37d947fa9a24 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Thu, 29 Mar 2018 17:07:55 +0200 Subject: [PATCH 2/5] :memo: fixed example for operator> #1029 --- doc/examples/operator__greater.cpp | 8 ++++---- doc/examples/operator__greater.link | 2 +- doc/examples/operator__greater.output | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/examples/operator__greater.cpp b/doc/examples/operator__greater.cpp index c632387cf..65bb9c049 100644 --- a/doc/examples/operator__greater.cpp +++ b/doc/examples/operator__greater.cpp @@ -17,8 +17,8 @@ int main() // output values and comparisons std::cout << std::boolalpha; - std::cout << array_1 << " == " << array_2 << " " << (array_1 > array_2) << '\n'; - std::cout << object_1 << " == " << object_2 << " " << (object_1 > object_2) << '\n'; - std::cout << number_1 << " == " << number_2 << " " << (number_1 > number_2) << '\n'; - std::cout << string_1 << " == " << string_2 << " " << (string_1 > string_2) << '\n'; + std::cout << array_1 << " > " << array_2 << " " << (array_1 > array_2) << '\n'; + std::cout << object_1 << " > " << object_2 << " " << (object_1 > object_2) << '\n'; + std::cout << number_1 << " > " << number_2 << " " << (number_1 > number_2) << '\n'; + std::cout << string_1 << " > " << string_2 << " " << (string_1 > string_2) << '\n'; } diff --git a/doc/examples/operator__greater.link b/doc/examples/operator__greater.link index 3fc848ea3..c59a48a10 100644 --- a/doc/examples/operator__greater.link +++ b/doc/examples/operator__greater.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/operator__greater.output b/doc/examples/operator__greater.output index 045847c38..910c48e3e 100644 --- a/doc/examples/operator__greater.output +++ b/doc/examples/operator__greater.output @@ -1,4 +1,4 @@ -[1,2,3] == [1,2,4] false -{"A":"a","B":"b"} == {"A":"a","B":"b"} false -17 == 17.0000000000001 false -"foo" == "bar" true +[1,2,3] > [1,2,4] false +{"A":"a","B":"b"} > {"A":"a","B":"b"} false +17 > 17.0000000000001 false +"foo" > "bar" true From 4efa8cdb4c7ae03674da7a29e1d70ae067836643 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Thu, 29 Mar 2018 17:19:21 +0200 Subject: [PATCH 3/5] :green_heart: fixed Valgrind options #1030 --- test/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index e5f6dc55a..9da2c80d4 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -13,8 +13,7 @@ endif() if(JSON_Valgrind) find_program(CMAKE_MEMORYCHECK_COMMAND valgrind) message(STATUS "Executing test suite with Valgrind (${CMAKE_MEMORYCHECK_COMMAND})") - set(MEMORYCHECK_COMMAND_OPTIONS "--error-exitcode=1 --leak-check=full") - set(memcheck_command "${CMAKE_MEMORYCHECK_COMMAND} ${CMAKE_MEMORYCHECK_COMMAND_OPTIONS}") + set(memcheck_command "${CMAKE_MEMORYCHECK_COMMAND} ${CMAKE_MEMORYCHECK_COMMAND_OPTIONS} --error-exitcode=1 --leak-check=full") separate_arguments(memcheck_command) endif() From a35d414c390c2671f2f4a9aecbd84010377175de Mon Sep 17 00:00:00 2001 From: Kevin Tonon Date: Tue, 3 Apr 2018 08:28:07 -0400 Subject: [PATCH 4/5] Update CMake to latest on Travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 8ce38cc8a..68a16db55 100644 --- a/.travis.yml +++ b/.travis.yml @@ -277,6 +277,7 @@ script: if [[ (-x $(which brew)) ]]; then brew update brew install cmake ninja + brew upgrade cmake cmake --version fi From e439a1a9a78e95836a47e6189423400ee8a02cfd Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Sat, 7 Apr 2018 13:15:44 +0200 Subject: [PATCH 5/5] CMake: 3.8+ is Sufficient The current CMake scripts depend on CMake 3.8+. This allows us to remove previous work-arounds. --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 958a129fd..a490ab6ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,8 +53,8 @@ target_include_directories( $ ) -## add debug view defintion file for msvc (natvis) [cmake <= 3.2.2 does not support export of source files] -if (MSVC AND CMAKE_VERSION VERSION_GREATER "3.2.2") +## add debug view defintion file for msvc (natvis) +if (MSVC) set(NLOHMANN_ADD_NATVIS TRUE) set(NLOHMANN_NATVIS_FILE "nlohmann_json.natvis") target_sources( @@ -64,7 +64,7 @@ if (MSVC AND CMAKE_VERSION VERSION_GREATER "3.2.2") $ ) endif() - + ## ## TESTS ## create and configure the unit test target