diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index ffbe650531..22cc056476 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -1102,9 +1102,6 @@ function(onnxruntime_set_compile_flags target_name) endif() target_compile_definitions(${target_name} PUBLIC -DNSYNC_ATOMIC_CPP11) - if(APPLE AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "iOSCross" AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "iOS") - target_compile_definitions(${target_name} PUBLIC -Doptional_CONFIG_SELECT_OPTIONAL=optional_OPTIONAL_NONSTD) - endif() target_include_directories(${target_name} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/external/nsync/public") endif() foreach(ORT_FLAG ${ORT_PROVIDER_FLAGS}) diff --git a/tools/ci_build/github/azure-pipelines/mac-coreml-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/mac-coreml-ci-pipeline.yml index acb7a2d1fc..3bba118068 100644 --- a/tools/ci_build/github/azure-pipelines/mac-coreml-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/mac-coreml-ci-pipeline.yml @@ -3,7 +3,7 @@ jobs: pool: vmImage: 'macOS-10.15' variables: - MACOSX_DEPLOYMENT_TARGET: '10.13' + MACOSX_DEPLOYMENT_TARGET: '10.14' timeoutInMinutes: 120 steps: - script: brew install coreutils ninja diff --git a/tools/ci_build/github/azure-pipelines/mac-ios-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/mac-ios-ci-pipeline.yml index 64acc42683..ff024c5f1e 100644 --- a/tools/ci_build/github/azure-pipelines/mac-ios-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/mac-ios-ci-pipeline.yml @@ -3,7 +3,7 @@ jobs: pool: vmImage: 'macOS-10.15' variables: - MACOSX_DEPLOYMENT_TARGET: '10.13' + MACOSX_DEPLOYMENT_TARGET: '10.14' timeoutInMinutes: 120 steps: - script: | diff --git a/tools/ci_build/github/azure-pipelines/templates/c-api-cpu-no-java.yml b/tools/ci_build/github/azure-pipelines/templates/c-api-cpu-no-java.yml index f4446f988f..202885a59c 100644 --- a/tools/ci_build/github/azure-pipelines/templates/c-api-cpu-no-java.yml +++ b/tools/ci_build/github/azure-pipelines/templates/c-api-cpu-no-java.yml @@ -95,7 +95,7 @@ jobs: workspace: clean: all variables: - MACOSX_DEPLOYMENT_TARGET: '10.13' + MACOSX_DEPLOYMENT_TARGET: '10.14' pool: vmImage: 'macOS-10.15' timeoutInMinutes: 120 diff --git a/tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml b/tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml index 3c5def19d4..764278047e 100644 --- a/tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml +++ b/tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml @@ -109,7 +109,7 @@ jobs: workspace: clean: all variables: - MACOSX_DEPLOYMENT_TARGET: '10.13' + MACOSX_DEPLOYMENT_TARGET: '10.14' pool: vmImage: 'macOS-10.15' timeoutInMinutes: 120 diff --git a/tools/ci_build/github/azure-pipelines/templates/mac-ci.yml b/tools/ci_build/github/azure-pipelines/templates/mac-ci.yml index 5ebedf7e49..9d1ffe459b 100644 --- a/tools/ci_build/github/azure-pipelines/templates/mac-ci.yml +++ b/tools/ci_build/github/azure-pipelines/templates/mac-ci.yml @@ -19,7 +19,7 @@ jobs: variables: BuildCommand: ${{ parameters.BuildCommand }} ALLOW_RELEASED_ONNX_OPSET_ONLY: ${{ parameters.AllowReleasedOpsetOnly }} - MACOSX_DEPLOYMENT_TARGET: '10.13' + MACOSX_DEPLOYMENT_TARGET: '10.14' steps: - checkout: self ${{ if ne(parameters.SubmoduleCheckoutMode, '') }}: diff --git a/tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml b/tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml index 5095fb39cd..61f287c156 100644 --- a/tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml +++ b/tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml @@ -1002,7 +1002,7 @@ stages: pool: vmImage: 'macOS-10.15' variables: - MACOSX_DEPLOYMENT_TARGET: '10.13' + MACOSX_DEPLOYMENT_TARGET: '10.14' strategy: matrix: Python36: