From c9dfb7d8c29a4e678970285e802ba5228ec69626 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9B=D0=B5=D0=BE=D0=BD=D0=B8=D0=B4=20=D0=AE=D1=80=D1=8C?= =?UTF-8?q?=D0=B5=D0=B2=20=28Leonid=20Yuriev=29?= Date: Tue, 5 Apr 2022 18:34:37 +0300 Subject: [PATCH] mdbx-cmake: add workaround for LCC 1.25 bug of class inline `static constexpr` member field definition. --- CMakeLists.txt | 4 ++++ test/CMakeLists.txt | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9673c956..b57a8578 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -613,6 +613,10 @@ macro(libmdbx_setup_libs TARGET MODE) target_link_libraries(${TARGET} ${MODE} log) endif() if(LIBCXX_FILESYSTEM AND MDBX_BUILD_CXX) + if(CMAKE_COMPILER_IS_ELBRUSCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 1.26.0 + AND NOT CMAKE_VERSION VERSION_LESS 3.13) + target_link_options(${TARGET} PUBLIC "-Wl,--allow-multiple-definition") + endif() target_link_libraries(${TARGET} PUBLIC ${LIBCXX_FILESYSTEM}) endif() endmacro() diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index fe397141..3f1184d1 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -46,6 +46,10 @@ set_target_properties(mdbx_test PROPERTIES target_setup_options(mdbx_test) if(NOT MDBX_BUILD_CXX AND LIBCXX_FILESYSTEM) + if(CMAKE_COMPILER_IS_ELBRUSCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 1.26.0 + AND NOT CMAKE_VERSION VERSION_LESS 3.13) + target_link_options(mdbx_test PRIVATE "-Wl,--allow-multiple-definition") + endif() target_link_libraries(mdbx_test ${LIBCXX_FILESYSTEM}) endif()