From 8b6bb1723e1ebfd6a9180736e7c27a80914717b3 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 5 Dec 2022 19:44:04 +0800 Subject: [PATCH] [Compile] Force `GLIBCXX_USE_CXX11_ABI`=1 (#799) * Force =1 * Update CMakeLists.txt * Update FastDeploy.cmake.in --- CMakeLists.txt | 1 + FastDeploy.cmake.in | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f8f565884..667951e71 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,6 +37,7 @@ include(${PROJECT_SOURCE_DIR}/cmake/utils.cmake) if(NOT MSVC) set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_FLAGS "-Wno-format") + add_definitions(-D_GLIBCXX_USE_CXX11_ABI=1) endif(NOT MSVC) if(UNIX AND (NOT APPLE) AND (NOT ANDROID) AND (NOT ENABLE_TIMVX)) diff --git a/FastDeploy.cmake.in b/FastDeploy.cmake.in index 9be498425..fd0ea847a 100755 --- a/FastDeploy.cmake.in +++ b/FastDeploy.cmake.in @@ -35,9 +35,12 @@ list(APPEND FASTDEPLOY_INCS ${CMAKE_CURRENT_LIST_DIR}/include) # Note(zhoushunjie): include some useful utils function include(${CMAKE_CURRENT_LIST_DIR}/utils.cmake) -if(NOT CMAKE_CXX_STANDARD) +# Set C++11 as standard for the whole project +if(NOT MSVC) set(CMAKE_CXX_STANDARD 11) -endif() + set(CMAKE_CXX_FLAGS "-Wno-format") + add_definitions(-D_GLIBCXX_USE_CXX11_ABI=1) +endif(NOT MSVC) if(ANDROID) add_library(fastdeploy STATIC IMPORTED GLOBAL)