From fb9f24eaee4c57d09ec0dca32abff840b39f7c7e Mon Sep 17 00:00:00 2001 From: Gil Date: Fri, 13 Jul 2018 11:09:44 -0700 Subject: Convert googletest and nanopb CMake builds to add_subdirectory (#1522) * Add a download-only boringssl ExternalProject Match boringssl version to grpc submodule version Note: not yet in use * Split grpc into separate download and build tasks This allows other external targets to download into the gRPC source tree before grpc is actually built. * Convert grpc to an http download * Build googletest with add_subdirectory Also: * Revert library-name modifications in the abseil-cpp build * Move abseil-cpp add_subdirectory build into place * Build nanopb with add_subdirectory * Force nanopb first to work around ODR violations This is a temporary work-around for b/111328563. --- cmake/FindGMock.cmake | 47 ----------------------------------------------- 1 file changed, 47 deletions(-) delete mode 100644 cmake/FindGMock.cmake (limited to 'cmake/FindGMock.cmake') diff --git a/cmake/FindGMock.cmake b/cmake/FindGMock.cmake deleted file mode 100644 index 76ce227..0000000 --- a/cmake/FindGMock.cmake +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 2018 Google -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -include(FindPackageHandleStandardArgs) - -find_path( - GMOCK_INCLUDE_DIR gmock/gmock.h - HINTS ${FIREBASE_INSTALL_DIR}/include -) - -find_library( - GMOCK_LIBRARY - NAMES gmock - HINTS ${FIREBASE_INSTALL_DIR}/lib -) - -find_package_handle_standard_args( - gmock - DEFAULT_MSG - GMOCK_INCLUDE_DIR - GMOCK_LIBRARY -) - -if(GMOCK_FOUND) - set(GMOCK_INCLUDE_DIRS ${GMOCK_INCLUDE_DIR}) - set(GMOCK_LIBRARIES ${GMOCK_LIBRARY}) - - if (NOT TARGET GMock::GMock) - add_library(GMock::GMock UNKNOWN IMPORTED) - set_target_properties( - GMock::GMock PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES ${GMOCK_INCLUDE_DIRS} - IMPORTED_LOCATION ${GMOCK_LIBRARY} - ) - endif() -endif(GMOCK_FOUND) -- cgit v1.2.3