Skip to content

Commit 8fb6f11

Browse files
committed
Fix Xcode version
1 parent d46ccd3 commit 8fb6f11

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

.pipelines/templates/use-xcode-version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
parameters:
44
- name: xcodeVersion
55
type: string
6-
default: "14.3"
6+
default: "16.1"
77

88
steps:
99
- bash: |

cmake/ext_tests.cmake

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,9 @@ function(add_test_target)
8686

8787
xctest_add_bundle(${ARG_TARGET} ${dummy_testee_target})
8888

89-
xctest_add_test("${ARG_TARGET}_xctest" ${ARG_TARGET})
89+
# Clear LIBRARY_OUTPUT_DIRECTORY to avoid duplicate PlugIns directory issue
90+
# See: https://gitlab.kitware.com/cmake/cmake/-/issues/26301
91+
set_property(TARGET ${ARG_TARGET} PROPERTY LIBRARY_OUTPUT_DIRECTORY)
9092

9193
target_sources(${ARG_TARGET} PRIVATE
9294
${ARG_TEST_SOURCES}

test/pp_api_test/test_imgcodec.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ TEST(ImageDecoderTest, TestJpegEncoderDecoder) {
108108
#elif __APPLE__
109109
out_range = out_tensor.Data() + 1296 * 3;
110110
ASSERT_EQ(std::vector<uint8_t>(out_range, out_range + 12),
111-
std::vector<uint8_t>({225, 236, 222, 228, 235, 219, 218, 220, 199, 203, 201, 178}));
111+
std::vector<uint8_t>({225, 236, 222, 225, 236, 222, 221, 219, 196, 203, 201, 178}));
112112

113113
out_range = out_tensor.Data() + 438 * width * 3;
114114
ASSERT_EQ(std::vector<uint8_t>(out_range, out_range + 12),

tools/ci_build/github/azure-pipeline/templates/use-xcode-version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
parameters:
44
- name: xcodeVersion
55
type: string
6-
default: "14.3"
6+
default: "16.1"
77

88
steps:
99
- bash: |

0 commit comments

Comments
 (0)