Add CMake test logic for iOS

Adds a configuration file for iOS simulator, and add platform specific logic to the cc_test function, to allow Android, iOS, and Desktop specific files without having to repeat the tests. Set up the log test to work for iOS.

PiperOrigin-RevId: 259815625

Author: a-maurice

CMakeLists.txt

@@ -69,8 +69,8 @@ if(DEFINED CMAKE_TOOLCHAIN_FILE AND NOT ANDROID)
   endif()
 endif()
 
-# We're on iOS if the system root is set to "iphoneos" or some variant.
-if("${CMAKE_OSX_SYSROOT}" MATCHES "iphoneos")
+# We're on iOS if the system root is set to "iphone" or some variant.
+if("${CMAKE_OSX_SYSROOT}" MATCHES "iphone")
   set(IOS TRUE CACHE BOOL "Target platform is iOS.")
 endif()
 

app/CMakeLists.txt

@@ -331,9 +331,11 @@ if(IOS)
   add_dependencies(firebase_app ${pod_target_name})
 endif()
 
-# Add the rest subdirectory, so that other libraries can access it
-add_subdirectory(rest)
-add_subdirectory(instance_id)
+if (NOT ANDROID AND NOT IOS)
+  # Add the rest subdirectory, so that other libraries can access it
+  add_subdirectory(rest)
+  add_subdirectory(instance_id)
+endif()
 
 if(FIREBASE_CPP_BUILD_TESTS)
   # Add the tests subdirectory

cmake/ios.cmake

@@ -14,13 +14,10 @@
 
 set(CMAKE_OSX_SYSROOT iphoneos)
 set(CMAKE_OSX_ARCHITECTURES "arm64")
-set(CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphoneos;-iphonesimulator")
+set(CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphoneos")
 set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO")
 set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "YES")
 
 # skip TRY_COMPILE checks
 set(CMAKE_CXX_COMPILER_WORKS TRUE)
-set(CMAKE_C_COMPILER_WORKS TRUE)
-
-# force MAC_BUNDLE for executable
-#set(CMAKE_MACOSX_BUNDLE YES)
+set(CMAKE_C_COMPILER_WORKS TRUE)

cmake/ios_simulator.cmake

@@ -0,0 +1,23 @@
+# Copyright 2018 Google Inc. All rights reserved.
+#
+# 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.
+
+set(CMAKE_OSX_SYSROOT iphonesimulator)
+set(CMAKE_OSX_ARCHITECTURES "x86_64")
+set(CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphonesimulator")
+set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO")
+set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "YES")
+
+# skip TRY_COMPILE checks
+set(CMAKE_CXX_COMPILER_WORKS TRUE)
+set(CMAKE_C_COMPILER_WORKS TRUE)

cmake/test_rules.cmake

@@ -23,11 +23,34 @@ include(CMakeParseArguments)
 # Defines a new test executable target with the given target name, sources, and
 # dependencies.  Implicitly adds DEPENDS on gtest and gtest_main.
 function(cc_test name)
-  set(multi DEPENDS SOURCES INCLUDES DEFINES)
+  set(multi DEPENDS SOURCES INCLUDES DEFINES
+      ANDROID_DEPENDS ANDROID_SOURCES ANDROID_INCLUDES ANDROID_DEFINES
+      IOS_DEPENDS IOS_SOURCES IOS_INCLUDES IOS_DEFINES
+      DESKTOP_DEPENDS DESKTOP_SOURCES DESKTOP_INCLUDES DESKTOP_DEFINES)
   # Parse the arguments into cc_test_SOURCES and cc_test_DEPENDS.
   cmake_parse_arguments(cc_test "" "" "${multi}" ${ARGN})
 
   list(APPEND cc_test_DEPENDS gmock gtest gtest_main)
+  if (ANDROID)
+    list(APPEND cc_test_SOURCES "${cc_test_ANDROID_SOURCES}")
+    list(APPEND cc_test_DEPENDS "${cc_test_ANDROID_DEPENDS}")
+    list(APPEND cc_test_INCLUDES "${cc_test_ANDROID_INCLUDES}")
+    list(APPEND cc_test_DEFINES "${cc_test_ANDROID_DEFINES}")
+  elseif (IOS)
+    list(APPEND cc_test_SOURCES "${cc_test_IOS_SOURCES}")
+    list(APPEND cc_test_DEPENDS
+         "${cc_test_IOS_DEPENDS}"
+         "-framework CoreFoundation"
+         "-framework Foundation"
+    )
+    list(APPEND cc_test_INCLUDES "${cc_test_IOS_INCLUDES}")
+    list(APPEND cc_test_DEFINES "${cc_test_IOS_DEFINES}")
+  else()
+    list(APPEND cc_test_SOURCES "${cc_test_DESKTOP_SOURCES}")
+    list(APPEND cc_test_DEPENDS "${cc_test_DESKTOP_DEPENDS}")
+    list(APPEND cc_test_INCLUDES "${cc_test_DESKTOP_INCLUDES}")
+    list(APPEND cc_test_DEFINES "${cc_test_DESKTOP_DEFINES}")
+  endif()
 
   add_executable(${name} ${cc_test_SOURCES})
   add_test(${name} ${name})

testing/CMakeLists.txt

@@ -28,7 +28,6 @@ binary_to_array("testdata_config_resource"
 set(config_common_SRCS
     config.h
     config.cc
-    config_test.cc
     ${FIREBASE_GEN_FILE_DIR}/testing/testdata_config_generated.h
     ${FIREBASE_GEN_FILE_DIR}/testing/testdata_config_resource.h
     ${FIREBASE_GEN_FILE_DIR}/testing/testdata_config_resource.cc)
@@ -57,10 +56,8 @@ endif()
 set(reporter_common_SRCS
     reporter.h
     reporter.cc
-    reporter_test.cc
     reporter_impl.h
     reporter_impl.cc
-    reporter_impl_test.cc
 )
 set(reporter_android_SRCS
     reporter_android.cc)
@@ -74,8 +71,7 @@ else()
 endif()
 
 set(ticker_common_SRCS
-    ticker.h
-    ticker_test.cc)
+    ticker.h)
 set(ticker_android_SRCS
     ticker_android.cc)
 set(ticker_ios_SRCS
@@ -99,12 +95,10 @@ endif()
 
 set(util_android_SRCS
     util_android.h
-    util_android.cc
-    util_android_test.cc)
+    util_android.cc)
 set(util_ios_SRCS
     util_ios.h
-    util_ios.mm
-    util_ios_test.mm)
+    util_ios.mm)
 if(ANDROID)
     set(util_SRCS
         "${util_android_SRCS}")