From 86601f5598dd0e90c28d4c2745bbdc4e0926d484 Mon Sep 17 00:00:00 2001 From: Andy Fillebrown Date: Wed, 8 Nov 2023 14:09:11 -0500 Subject: [PATCH] Change CMAKE_OSX_DEPLOYMENT_TARGET to 10.13 from 10.11 --- Build/AzureDevOps/azure-pipelines.yml | 6 +++--- CMakeLists.txt | 2 +- GLTFSDK.TestUtils/CMakeLists.txt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Build/AzureDevOps/azure-pipelines.yml b/Build/AzureDevOps/azure-pipelines.yml index c8555b1..7262c5c 100644 --- a/Build/AzureDevOps/azure-pipelines.yml +++ b/Build/AzureDevOps/azure-pipelines.yml @@ -124,7 +124,7 @@ jobs: pool: vmImage: 'macOS-10.14' - + strategy: matrix: macOS-Release: @@ -162,7 +162,7 @@ jobs: pool: vmImage: 'macOS-10.14' - + strategy: matrix: iOS-Release: @@ -180,7 +180,7 @@ jobs: - task: CMake@1 inputs: workingDirectory: 'built/Int/cmake_$(buildPlatform)' - cmakeArgs: '../../.. -G Xcode -DCMAKE_TOOLCHAIN_FILE="$(Build.SourcesDirectory)/Build/CMake/ios.toolchain.cmake" -DPLATFORM=OS -DDEPLOYMENT_TARGET="10.11" -DENABLE_UNIT_TESTS="OFF"' + cmakeArgs: '../../.. -G Xcode -DCMAKE_TOOLCHAIN_FILE="$(Build.SourcesDirectory)/Build/CMake/ios.toolchain.cmake" -DPLATFORM=OS -DDEPLOYMENT_TARGET="10.13" -DENABLE_UNIT_TESTS="OFF"' - task: CMake@1 inputs: diff --git a/CMakeLists.txt b/CMakeLists.txt index d54636a..a43ac33 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,7 @@ endif() set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG -D_DEBUG -DFEATURE_ASSERTS_ENABLED") -set(CMAKE_OSX_DEPLOYMENT_TARGET 10.11) +set(CMAKE_OSX_DEPLOYMENT_TARGET 10.13) if (WIN32) # Define _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING to disable the warnings in the current version of Google Test (1.8.0) diff --git a/GLTFSDK.TestUtils/CMakeLists.txt b/GLTFSDK.TestUtils/CMakeLists.txt index a25fb9f..23dc036 100644 --- a/GLTFSDK.TestUtils/CMakeLists.txt +++ b/GLTFSDK.TestUtils/CMakeLists.txt @@ -4,7 +4,7 @@ project (GLTFSDK.TestUtils) set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG -D_DEBUG -DFEATURE_ASSERTS_ENABLED") -set(CMAKE_OSX_DEPLOYMENT_TARGET 10.11) +set(CMAKE_OSX_DEPLOYMENT_TARGET 10.13) add_library(GLTFSDK.TestUtils INTERFACE IMPORTED GLOBAL) set_target_properties(GLTFSDK.TestUtils PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_LIST_DIR}")