Skip to content
Snippets Groups Projects
Commit e5ff3a54 authored by Antoine Regimbeau's avatar Antoine Regimbeau
Browse files

MRG: Merge branch 'abi_backward_compatibility' into release-6.6

parents e40144f4 b27b576a
No related branches found
No related tags found
No related merge requests found
...@@ -59,5 +59,17 @@ function(patch_cmake_files) ...@@ -59,5 +59,17 @@ function(patch_cmake_files)
# endforeach() # endforeach()
# endif() # endif()
# file(WRITE "${otb_opengl}" ${otb_opengl_cmake_NEW}) # file(WRITE "${otb_opengl}" ${otb_opengl_cmake_NEW})
#patch for ABI compatibility
if(EXISTS "${PATCH_STAGE_DIR}/UseOTB.cmake")
file(APPEND "${PATCH_STAGE_DIR}/UseOTB.cmake"
"\n\n# ABI compatibility \
\nif ( CMAKE_CXX_COMPILER_ID STREQUAL \"GNU\") \
\n if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 5.0 ) \
\n add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0) \
\n endif() \
\nendif()" )
endif()
endfunction() endfunction()
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment