ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2025-01-27 13:20:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Use fabi-version=17 by default with gcc

Browse Source
This commit is contained in:
Matthias Hochsteger 2025-01-24 13:38:40 +01:00
parent 5292a09c94
commit 311ae9e89b
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libsrc/core/CMakeLists.txt
View File

@ -24,7 +24,7 @@ if(EMSCRIPTEN)
target_compile_options(ngcore PUBLIC -sNO_DISABLE_EXCEPTION_CATCHING) target_compile_options(ngcore PUBLIC -sNO_DISABLE_EXCEPTION_CATCHING)
endif() endif()
if (CMAKE_CXX_COMPILER_ID MATCHES "GNU") if (CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND USE_PYTHON)
# Python packages on Linux are compiled with the old ABI, # Python packages on Linux are compiled with the old ABI,
# make sure that the same ABI is used in plugins aswell # make sure that the same ABI is used in plugins aswell
try_run( try_run(
@ -33,19 +33,21 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
RUN_OUTPUT_VARIABLE use_glibcxx_cxx11_abi RUN_OUTPUT_VARIABLE use_glibcxx_cxx11_abi
) )
target_compile_definitions(ngcore PUBLIC -D_GLIBCXX_USE_CXX11_ABI=${use_glibcxx_cxx11_abi}) target_compile_definitions(ngcore PUBLIC -D_GLIBCXX_USE_CXX11_ABI=${use_glibcxx_cxx11_abi})
if(USE_PYTHON) try_run(
try_run( ret_val can_compile
ret_val can_compile ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/_get_gxx_abi.cpp
${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/_get_gxx_abi.cpp RUN_OUTPUT_VARIABLE default_cxx_abi_version
RUN_OUTPUT_VARIABLE cxx_abi_version )
) if(${can_compile} AND (${ret_val} EQUAL 0))
if(${can_compile} AND (${ret_val} EQUAL 0)) # Different python modules using pybind11 need to use the same C++ ABI version
# Different python modules using pybind11 need to use the same C++ ABI version # for compatibility
# for compatibility set(cxx_abi_version 17)
message(STATUS "GNU C++ ABI version: ${cxx_abi_version}") if(cxx_abi_version LESS default_cxx_abi_version)
target_compile_options(ngcore PUBLIC "-fabi-version=${cxx_abi_version}") set(cxx_abi_version ${default_cxx_abi_version})
endif() endif()
endif(USE_PYTHON) message(STATUS "GNU C++ ABI version: ${cxx_abi_version}")
target_compile_options(ngcore PUBLIC "-fabi-version=${cxx_abi_version}")
endif()
endif() endif()
if(USE_PYTHON) if(USE_PYTHON)