From 0c27b7c58b289e9958e5d5c5577e511131cbf982 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Tue, 28 Dec 2021 13:36:20 +0100 Subject: [PATCH] :alembic: use fix from https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90050 --- cmake/ci.cmake | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cmake/ci.cmake b/cmake/ci.cmake index 4162c8930..77d650901 100644 --- a/cmake/ci.cmake +++ b/cmake/ci.cmake @@ -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_CXX_FLAGS=-lstdc++fs") else() unset(ADDITIONAL_FLAGS) 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 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() unset(COMPILER_TOOL CACHE) endforeach()