Skip to content

Commit 91f0096

Browse files
authored
Force on the CXX11_ABI flag (#262)
1 parent c1cb80c commit 91f0096

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

CMakeLists.txt

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -130,16 +130,13 @@ enable_language(C)
130130
enable_language(CXX)
131131

132132
if(NOT MSVC AND NOT APPLE)
133-
# Linux-specific option.
134-
if (FIREBASE_LINUX_USE_CXX11_ABI)
135-
add_definitions(-D_GLIBCXX_USE_CXX11_ABI=1)
136-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GLIBCXX_USE_CXX11_ABI=1")
137-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GLIBCXX_USE_CXX11_ABI=1")
138-
else()
139-
add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0)
140-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GLIBCXX_USE_CXX11_ABI=0")
141-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GLIBCXX_USE_CXX11_ABI=0")
142-
endif()
133+
# The Linux Unity Editor seems to require using the CXX11 ABI for Firestore,
134+
# so we turn the option on, and set the flag to true for the C++ SDK to pick
135+
# it up as well.
136+
add_definitions(-D_GLIBCXX_USE_CXX11_ABI=1)
137+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GLIBCXX_USE_CXX11_ABI=1")
138+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GLIBCXX_USE_CXX11_ABI=1")
139+
set(FIREBASE_LINUX_USE_CXX11_ABI TRUE)
143140
endif()
144141

145142
if(NOT ANDROID AND NOT IOS)

0 commit comments

Comments
 (0)