From 9cfb15be8b4d2c7b679857cc3e58c1ab2ed3fc1c Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Fri, 9 Jul 2021 11:28:43 -0400 Subject: [PATCH] document why we are patching json.hpp --- CMakeLists.txt | 3 +-- cmake/patches/nlohmann_json.hpp | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e083b75..850a51a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,9 +45,8 @@ CPMAddPackage( URL https://github.com/nlohmann/json/releases/download/v3.9.1/include.zip URL_HASH SHA256=6bea5877b1541d353bd77bdfbdb2696333ae5ed8f9e8cc22df657192218cad91 PATCH_COMMAND + # Work around compiler bug in nvcc 11.0, see NVIDIA/NVBench#18 ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/cmake/patches/nlohmann_json.hpp" "./include/nlohmann/json.hpp" - - ) # Development branch: diff --git a/cmake/patches/nlohmann_json.hpp b/cmake/patches/nlohmann_json.hpp index 6b3e0fe..9a3a0cc 100644 --- a/cmake/patches/nlohmann_json.hpp +++ b/cmake/patches/nlohmann_json.hpp @@ -8761,6 +8761,7 @@ if no parse error occurred. @since version 1.0.0 */ +// Work around compiler bug in nvcc 11.0, see NVIDIA/NVBench#18 #if defined(__NVCC__) && \ __cplusplus >= 201703L && \ __CUDACC_VER_MAJOR__ == 11 && \