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 09:01:04 +01:00
parent 8372e03e57
commit c4aeceaeca
No known key found for this signature in database
GPG Key ID: 7F3CEA63AE251B69
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmake/ci.cmake
View File

@ -814,9 +814,12 @@ add_custom_target(ci_cmake_flags
foreach(COMPILER g++-4.8 g++-4.9 g++-5 g++-6 g++-7 g++-8 g++-9 g++-10 clang++-3.5 clang++-3.6 clang++-3.7 clang++-3.8 clang++-3.9 clang++-4.0 clang++-5.0 clang++-6.0 clang++-7 clang++-8 clang++-9 clang++-10 clang++-11 clang++-12 clang++-13) foreach(COMPILER g++-4.8 g++-4.9 g++-5 g++-6 g++-7 g++-8 g++-9 g++-10 clang++-3.5 clang++-3.6 clang++-3.7 clang++-3.8 clang++-3.9 clang++-4.0 clang++-5.0 clang++-6.0 clang++-7 clang++-8 clang++-9 clang++-10 clang++-11 clang++-12 clang++-13)
find_program(COMPILER_TOOL NAMES ${COMPILER}) find_program(COMPILER_TOOL NAMES ${COMPILER})
if (COMPILER_TOOL) if (COMPILER_TOOL)
# fix for https://github.com/nlohmann/json/pull/3101#issuecomment-998788786 / https://stackoverflow.com/a/64051725/266378
if ("${COMPILER}" STREQUAL "clang++-9") 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") 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_CXX_FLAGS=-lstdc++fs")
else() else()
unset(ADDITIONAL_FLAGS) unset(ADDITIONAL_FLAGS)
endif() endif()