From dedefa65c1c1c2fabc25998b2ba0d2eb7240e508 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Sun, 5 Jul 2020 15:54:27 +0200
Subject: [PATCH] applying CMake patch from @MaartenBent

---
 CMakeLists.txt              | 2 +-
 build/cmake/functions.cmake | 8 --------
 build/cmake/init.cmake      | 5 -----
 build/cmake/setup.cmake     | 6 +-----
 4 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c671fb1c0b..c63a2361ba 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,7 +29,7 @@ endif()
 if(APPLE AND NOT CMAKE_OSX_DEPLOYMENT_TARGET)
     # If no deployment target has been set default to the minimum supported
     # OS X version (this has to be set before the first project() call)
-    set(CMAKE_OSX_DEPLOYMENT_TARGET 10.9 CACHE STRING "OS X Deployment Target")
+    set(CMAKE_OSX_DEPLOYMENT_TARGET 10.10 CACHE STRING "OS X Deployment Target")
 endif()
 
 include(build/cmake/policies.cmake NO_POLICY_SCOPE)
diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake
index 741358f633..c33dd3946c 100644
--- a/build/cmake/functions.cmake
+++ b/build/cmake/functions.cmake
@@ -77,14 +77,6 @@ endmacro()
 function(wx_set_common_target_properties target_name)
     cmake_parse_arguments(wxCOMMON_TARGET_PROPS "DEFAULT_WARNINGS" "" "" ${ARGN})
 
-    if(APPLE AND CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS 10.9 AND wxHAS_CXX11)
-        if(CMAKE_GENERATOR STREQUAL "Xcode")
-            set_target_properties(${target_name} PROPERTIES XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY libc++)
-        else()
-            target_compile_options(${target_name} PUBLIC "-stdlib=libc++")
-            target_link_libraries(${target_name} PRIVATE "-stdlib=libc++")
-        endif()
-    endif()
     set_target_properties(${target_name} PROPERTIES
         LIBRARY_OUTPUT_DIRECTORY "${wxOUTPUT_DIR}${wxPLATFORM_LIB_DIR}"
         ARCHIVE_OUTPUT_DIRECTORY "${wxOUTPUT_DIR}${wxPLATFORM_LIB_DIR}"
diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake
index 4524bc70e6..d013e92a5a 100644
--- a/build/cmake/init.cmake
+++ b/build/cmake/init.cmake
@@ -11,11 +11,6 @@
 if(DEFINED wxBUILD_CXX_STANDARD AND NOT wxBUILD_CXX_STANDARD STREQUAL COMPILER_DEFAULT)
     set(CMAKE_CXX_STANDARD ${wxBUILD_CXX_STANDARD})
 endif()
-if(NOT CMAKE_CXX_STANDARD EQUAL 98)
-    set(wxHAS_CXX11 TRUE)
-else()
-    set(wxHAS_CXX11 FALSE)
-endif()
 
 if(MSVC)
     # Determine MSVC runtime library flag
diff --git a/build/cmake/setup.cmake b/build/cmake/setup.cmake
index e26af41982..1272e3de49 100644
--- a/build/cmake/setup.cmake
+++ b/build/cmake/setup.cmake
@@ -23,10 +23,6 @@ include(CheckTypeSize)
 include(CMakePushCheckState)
 include(TestBigEndian)
 
-if(APPLE AND CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS 10.9 AND wxHAS_CXX11)
-    set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS} "-stdlib=libc++")
-endif()
-
 # Add a definition to setup.h and append it to a list of defines for
 # for compile checks
 macro(wx_setup_definition def)
@@ -143,7 +139,7 @@ wx_check_c_source_compiles(
     stdio.h
     )
 #TODO: wxNO_VARIADIC_MACROS
-if(wxUSE_STL AND NOT wxHAS_CXX11)
+if(wxUSE_STL AND CMAKE_CXX_STANDARD EQUAL 98)
     wx_check_cxx_source_compiles("
         std::vector<int> moo;
         std::list<int> foo;