Merge branch 'master' of https://github.com/ARMmbed/mbed-os

Author: multiplemonomials

UNITTESTS/README.md

@@ -85,7 +85,7 @@ Mbed CLI supports unit tests through the `mbed test --unittests` command. For in
 
 A unit tests suite consists of one or more test cases. The test cases should cover all the functions in a class under test. All the external dependencies are stubbed including the other classes in the same module. Avoid stubbing header files. Finally, analyze code coverage to ensure all code is tested, and no dead code is found.
 
-Unit tests are written using [Google Test v1.8.1](https://github.com/google/googletest/releases/tag/release-1.8.1).
+Unit tests are written using [Google Test v1.10.0](https://github.com/google/googletest/releases/tag/release-1.10.0).
 
 Please see the [documentation for Google Test](https://github.com/google/googletest/blob/master/googletest/docs/primer.md) to learn how to write unit tests using its framework. See the [documentation for Google Mock](https://github.com/google/googletest/blob/master/googlemock/docs/Documentation.md) if you want to write and use C++ mock classes instead of stubs.
 

UNITTESTS/googletest-CMakeLists.txt.in

@@ -5,7 +5,7 @@ project(googletest-download NONE)
 include(ExternalProject)
 ExternalProject_Add(googletest
   GIT_REPOSITORY    https://github.com/google/googletest.git
-  GIT_TAG           release-1.8.1
+  GIT_TAG           release-1.10.0
   SOURCE_DIR        "${CMAKE_BINARY_DIR}/googletest-src"
   BINARY_DIR        "${CMAKE_BINARY_DIR}/googletest-build"
   CONFIGURE_COMMAND ""

connectivity/drivers/nfc/CMakeLists.txt

@@ -4,3 +4,7 @@
 if("PN512" IN_LIST MBED_TARGET_LABELS)
     add_subdirectory(PN512)
 endif()
+
+if("M24SR" IN_LIST MBED_TARGET_LABELS)
+    add_subdirectory(TARGET_M24SR)
+endif()

connectivity/drivers/nfc/TARGET_M24SR/CMakeLists.txt

@@ -0,0 +1,13 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+target_include_directories(mbed-nfc
+    INTERFACE
+        include
+        include/nfc
+)
+
+target_sources(mbed-nfc
+    INTERFACE
+        source/m24sr_driver.cpp
+)