Force boringssl for curl build.

CMakeLists.txt

@@ -171,7 +171,11 @@ else()
  download_external_sources()
  message(STATUS "Download complete.")
 
- set(FIRESTORE_SOURCE_DIR ${FIREBASE_BINARY_DIR}/external/src/firestore)
+ message(STATUS "Building external project dependencies...")
+ build_external_dependencies()
+ message(STATUS "Build of external project dependencies complete.")
+
+set(FIRESTORE_SOURCE_DIR ${FIREBASE_BINARY_DIR}/external/src/firestore)
 endif()
 
 # Include Firestore's external build early to resolve conflicts on packages.
@@ -239,7 +243,7 @@ if(DESKTOP)
  add_external_library(boringssl)
  set(OPENSSL_FOUND TRUE)
  set(OPENSSL_ROOT_DIR ${CMAKE_BINARY_DIR}/external/src/boringssl-build)
- set(OPENSSL_INCLUDE_DIR ${CMAKE_BINARY_DIR}/external/src/boringssl/src/include)
+ set(OPENSSL_INCLUDE_DIR ${CMAKE_BINARY_DIR}/external/src/boringssl/include)
  set(OPENSSL_CRYPTO_LIBRARY ${CMAKE_BINARY_DIR}/external/src/boringssl-build/crypto/libcrypto.a)
  set(OPENSSL_CRYPTO_LIBRARIES ${OPENSSL_CRYPTO_LIBRARY})
  set(OPENSSL_SSL_LIBRARY ${CMAKE_BINARY_DIR}/external/src/boringssl-build/ssl/libssl.a)
@@ -248,11 +252,32 @@ if(DESKTOP)
  # BoringSSL is compatible with OpenSSL 1.1.0.
  set(OPENSSL_VERSION '1.1.0')
 
+ add_library(OpenSSL::Crypto STATIC IMPORTED)
+ set_target_properties(OpenSSL::Crypto PROPERTIES
+ IMPORTED_LOCATION "${OPENSSL_CRYPTO_LIBRARIES}"
+ INTERFACE_INCLUDE_DIRECTORIES "${OPENSSL_INCLUDE_DIR}"
+ )
+ add_library(OpenSSL::SSL STATIC IMPORTED)
+ set_target_properties(OpenSSL::SSL PROPERTIES
+ IMPORTED_LOCATION "${OPENSSL_SSL_LIBRARIES}"
+ INTERFACE_INCLUDE_DIRECTORIES "${OPENSSL_INCLUDE_DIR}"
+ )
+
+ # Now if we do find_package(OpenSSL) it should give us BoringSSL.
+ find_package(OpenSSL)
+
+ if(NOT ${OPENSSL_INCLUDE_DIR} MATCHES boringssl)
+ message(FATAL_ERROR "BoringSSL was not configured correctly.")
+ endif()
+
  # Build curl as a static library
  set(CURL_STATICLIB ON CACHE BOOL "")
  if (WIN32)
  set(CMAKE_USE_WINSSL ON CACHE BOOL "")
  endif()
+ add_library(OpenSSL::Crypto ALIAS crypto)
+ add_library(OpenSSL::SSL ALIAS ssl)
+
  add_external_library(curl)
 
  add_external_library(libuv)
@@ -326,7 +351,7 @@ if(DESKTOP)
  if(FIRESTORE_USE_EXTERNAL_CMAKE_BUILD)
  # The Firestore build includes protobuf and nanopb already
  list(APPEND CMAKE_MODULE_PATH ${NANOPB_SOURCE_DIR}/extra)
- find_package(Nanopb REQUIRED)
+ find_package(NANOPB REQUIRED)
 
  set(PROTOBUF_FOUND ON)
  else()
@@ -338,7 +363,7 @@ if(DESKTOP)
  # NanoPB has a FindNanopb which defines the function to generate files,
  # so add it to the module path, and use that.
  list(APPEND CMAKE_MODULE_PATH ${NANOPB_SOURCE_DIR}/extra)
- find_package(Nanopb)
+ find_package(NANOPB)
 
  target_compile_definitions(
  protobuf-nanopb-static

cmake/external/boringssl.cmake

@@ -20,7 +20,8 @@ endif()
 
 # Based on https://github.com/grpc/grpc/blob/v1.27.0/bazel/grpc_deps.bzl
 # master-with-bazel@{2019-10-18}
-set(commit 83da28a68f32023fd3b95a8ae94991a07b1f6c62)
+# set(commit 83da28a68f32023fd3b95a8ae94991a07b1f6c62)
+set(commit master)
 
 ExternalProject_Add(
  boringssl

cmake/external/curl.cmake

@@ -19,7 +19,8 @@ if(TARGET curl OR NOT DOWNLOAD_CURL)
 endif()
 
 #set(version 7_58_0)
-set(version master)
+set(version 7_73_0)
+#set(version master)
 
 ExternalProject_Add(
  curl

cmake/external_rules.cmake

@@ -94,14 +94,45 @@ function(download_external_sources)
  )
 
  # CMake's find_package(OpenSSL) doesn't quite work right with BoringSSL unless the header file contains OPENSSL_VERSION_NUMBER.
- file(READ ${PROJECT_BINARY_DIR}/external/src/boringssl/src/include/openssl/opensslv.h TMP_HEADER_CONTENTS)
+ file(READ ${PROJECT_BINARY_DIR}/external/src/boringssl/include/openssl/opensslv.h TMP_HEADER_CONTENTS)
  if (NOT TMP_HEADER_CONTENTS MATCHES OPENSSL_VERSION_NUMBER)
- file(APPEND ${PROJECT_BINARY_DIR}/external/src/boringssl/src/include/openssl/opensslv.h
+ file(APPEND ${PROJECT_BINARY_DIR}/external/src/boringssl/include/openssl/opensslv.h
  "#ifndef OPENSSL_VERSION_NUMBER\n# define OPENSSL_VERSION_NUMBER 0x10100000L\n#endif\n")
  endif()
 
 endfunction()
 
+# Builds a subset of external dependencies that need to be built before everything else.
+function(build_external_dependencies)
+ # Setup cmake environment.
+ # These commands are executed from within the currect context, which has set
+ # variables for the target platform. We use "env -i" to clear these
+ # variables, and manually keep the PATH to regular bash path.
+ if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
+ # Windows doesn't have an 'env' command
+ set(ENV_COMMAND "")
+ else()
+ set(firebase_command_line_path "$ENV{PATH}")
+ set(firebase_command_line_home "$ENV{HOME}")
+ set(ENV_COMMAND env -i PATH=${firebase_command_line_path} HOME=${firebase_command_line_home} )
+ endif()
+
+ execute_process(
+ COMMAND ${ENV_COMMAND} cmake ../boringssl
+ WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/external/src/boringssl-build
+ )
+
+ # Run downloads in parallel if we know how
+ if(CMAKE_GENERATOR STREQUAL "Unix Makefiles")
+ set(cmake_build_args -j)
+ endif()
+
+ execute_process(
+ COMMAND ${ENV_COMMAND} cmake --build . -- ${cmake_build_args}
+ WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/external/src/boringssl-build
+ )
+endfunction()
+
 # Populates directory variables for the given name to the location that name
 # would be in after a call to download_external_sources, if the variable is
 # not already a valid directory.