Skip to content

Delete Firestore public C++ API #2050

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Nov 7, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions cmake/Findfirebase_cpp_sdk.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ if(APPLE)
else()
set(FIREBASE_CPP_LIB_DIR ${FIREBASE_CPP_SDK_DIR}/libs/darwin/universal)
endif()

elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
set(FIREBASE_CPP_LIB_DIR ${FIREBASE_CPP_SDK_DIR}/libs/linux/${CMAKE_SYSTEM_PROCESSOR})

endif()

find_library(
Expand Down
14 changes: 13 additions & 1 deletion cmake/compiler_id.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,24 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# Adds cheap tests for various compilers
# Adds cheap tests for various compilers, and any global compiler setup
# required across all dependencies.

if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
set(CXX_CLANG TRUE)
endif()

if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
set(CXX_GNU TRUE)

if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
# Disable the C++11 ABI introduced in GCC 5 for compatibility with Firebase
# C++, which is still compiled with GCC 4.
#
# Note that this is set here rather than in compiler_setup.cmake so that it
# applies to all subdirectory builds, including all external dependencies.
#
# TODO(b/119137881): Remove this when Firebase C++ built with GCC 5.
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GLIBCXX_USE_CXX11_ABI=0")
endif()
endif()
2 changes: 1 addition & 1 deletion cmake/compiler_setup.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# C++ Compiler setup
# C++ Compiler setup that's local to Firebase code in this repo.

include(compiler_id)

Expand Down