External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

⚗️ use fix from https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90050

Browse Source
This commit is contained in:
Niels Lohmann 2021-12-28 14:32:01 +01:00
parent 5e12e56eae
commit d5a95e4f92
No known key found for this signature in database
GPG Key ID: 7F3CEA63AE251B69
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/ci.cmake
View File

@ -817,9 +817,6 @@ foreach(COMPILER g++-4.8 g++-4.9 g++-5 g++-6 g++-7 g++-8 g++-9 g++-10 clang++-3.
if ("${COMPILER}" STREQUAL "clang++-9")
# fix for https://github.com/nlohmann/json/pull/3101#issuecomment-998788786 / https://stackoverflow.com/a/64051725/266378
set(ADDITIONAL_FLAGS "-DCMAKE_CXX_FLAGS=--gcc-toolchain=/root/gcc/9")
elseif ("${COMPILER}" STREQUAL "g++-8")
# fix for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90050
set(ADDITIONAL_FLAGS "-DCMAKE_EXE_LINKER_FLAGS=-lstdc++fs")
else()
unset(ADDITIONAL_FLAGS)
endif()

5
test/CMakeLists.txt
View File

@ -99,6 +99,11 @@ foreach(file ${files})
target_link_libraries(${testcase}_cpp17 PRIVATE ${NLOHMANN_JSON_TARGET_NAME})
target_compile_features(${testcase}_cpp17 PRIVATE cxx_std_17)
if (CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8.0 AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0)
# fix for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90050
target_link_libraries(${testcase}_cpp17 PRIVATE stdc++fs)
endif()
if (JSON_FastTests)
add_test(NAME "${testcase}_cpp17"
COMMAND ${testcase}_cpp17 ${DOCTEST_TEST_FILTER}