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 13:36:20 +01:00
parent c4aeceaeca
commit 0c27b7c58b
No known key found for this signature in database
GPG Key ID: 7F3CEA63AE251B69
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
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") if ("${COMPILER}" STREQUAL "clang++-9")
# fix for https://github.com/nlohmann/json/pull/3101#issuecomment-998788786 / https://stackoverflow.com/a/64051725/266378 # 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()
@ -834,6 +831,11 @@ foreach(COMPILER g++-4.8 g++-4.9 g++-5 g++-6 g++-7 g++-8 g++-9 g++-10 clang++-3.
COMMAND cd ${PROJECT_BINARY_DIR}/build_compiler_${COMPILER} && ${CMAKE_CTEST_COMMAND} --parallel ${N} --exclude-regex "test-unicode" --output-on-failure COMMAND cd ${PROJECT_BINARY_DIR}/build_compiler_${COMPILER} && ${CMAKE_CTEST_COMMAND} --parallel ${N} --exclude-regex "test-unicode" --output-on-failure
COMMENT "Compile and test with ${COMPILER}" COMMENT "Compile and test with ${COMPILER}"
) )
if ("${COMPILER}" STREQUAL "g++-8")
# fix for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90050
target_link_libraries(ci_test_compiler_${COMPILER} PUBLIC stdc++fs)
endif()
endif() endif()
unset(COMPILER_TOOL CACHE) unset(COMPILER_TOOL CACHE)
endforeach() endforeach()