From 78201ad970124ba3c54bdb6a1acab4b874cf97fc Mon Sep 17 00:00:00 2001 From: Jonathan Perret Date: Thu, 8 Aug 2024 23:30:20 +0200 Subject: [PATCH 1/3] fix FloatingEq2Matcher ambiguous error --- include/arduino-mock/Arduino.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/arduino-mock/Arduino.h b/include/arduino-mock/Arduino.h index 77b496b..805e52c 100644 --- a/include/arduino-mock/Arduino.h +++ b/include/arduino-mock/Arduino.h @@ -19,6 +19,7 @@ extern "C" { #ifdef WIN32 #elif linux +#elif __APPLE__ #else #define true 0x1 #define false 0x0 From a0a41761a687ac534a3549b41bf679f241d7f1f2 Mon Sep 17 00:00:00 2001 From: Jonathan Perret Date: Thu, 8 Aug 2024 23:30:28 +0200 Subject: [PATCH 2/3] fix missing iomanip include --- src/Serial.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Serial.cc b/src/Serial.cc index e907953..a9938b4 100644 --- a/src/Serial.cc +++ b/src/Serial.cc @@ -1,5 +1,6 @@ // Copyright 2014 http://switchdevice.com +#include #include "arduino-mock/Serial.h" static SerialMock* gSerialMock = NULL; From b8c182acb35637f67a14ca4a876f21220589604e Mon Sep 17 00:00:00 2001 From: Jonathan Perret Date: Sun, 13 Oct 2024 16:28:01 +0200 Subject: [PATCH 3/3] set C++ standard to C++11 Required for compatibility with AppleClang. --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6954e0c..d60baf8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,8 @@ cmake_minimum_required (VERSION 2.8.8) project (arduino_mock) +set(CMAKE_CXX_STANDARD 11 CACHE STRING "Set the C++ standard to be used for compiling") + find_package(Threads REQUIRED) add_subdirectory(lib/gtest)