From 80d4d4d92c9a80159fb4e42656e23f16eac290ae Mon Sep 17 00:00:00 2001 From: Giles Payne Date: Sun, 27 Sep 2020 12:13:49 +0900 Subject: [PATCH] Update tests and samples to work with changes to dynamic build --- modules/objc/test/cmakelists.template | 1 + .../project.pbxproj | Bin 0 -> 16888 bytes .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++++++ .../project.pbxproj | Bin 0 -> 18142 bytes .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++++++ 5 files changed, 17 insertions(+) create mode 100644 samples/swift/ios/ColorBlobDetection/ColorBlobDetectionDynamic.xcodeproj/project.pbxproj create mode 100644 samples/swift/ios/ColorBlobDetection/ColorBlobDetectionDynamic.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 samples/swift/ios/FaceDetection/FaceDetectionDynamic.xcodeproj/project.pbxproj create mode 100644 samples/swift/ios/FaceDetection/FaceDetectionDynamic.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/modules/objc/test/cmakelists.template b/modules/objc/test/cmakelists.template index 48578645b8..f25324e585 100644 --- a/modules/objc/test/cmakelists.template +++ b/modules/objc/test/cmakelists.template @@ -27,6 +27,7 @@ xctest_add_bundle(OpenCVTestTests OpenCVTest ${test_sources} test/resources ${FR set_target_properties(OpenCVTestTests PROPERTIES XCODE_ATTRIBUTE_FRAMEWORK_SEARCH_PATHS "${FRAMEWORK_DIR}" XCODE_ATTRIBUTE_OTHER_SWIFT_FLAGS "-Xcc ${SUPPRESS_WARNINGS_FLAGS}" + XCODE_ATTRIBUTE_LD_RUNPATH_SEARCH_PATHS "${FRAMEWORK_DIR}" ) # link necessary Frameworks diff --git a/samples/swift/ios/ColorBlobDetection/ColorBlobDetectionDynamic.xcodeproj/project.pbxproj b/samples/swift/ios/ColorBlobDetection/ColorBlobDetectionDynamic.xcodeproj/project.pbxproj new file mode 100644 index 0000000000000000000000000000000000000000..fb842a38bf8d7d38f76cc84525fae28afd5c88f8 GIT binary patch literal 16888 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 literal 0 HcmV?d00001 diff --git a/samples/swift/ios/ColorBlobDetection/ColorBlobDetectionDynamic.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/samples/swift/ios/ColorBlobDetection/ColorBlobDetectionDynamic.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000000..3d4c1e5525 --- /dev/null +++ b/samples/swift/ios/ColorBlobDetection/ColorBlobDetectionDynamic.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/samples/swift/ios/FaceDetection/FaceDetectionDynamic.xcodeproj/project.pbxproj b/samples/swift/ios/FaceDetection/FaceDetectionDynamic.xcodeproj/project.pbxproj new file mode 100644 index 0000000000000000000000000000000000000000..e0d17a8e40216149c484bf092ebdea008eabc6d0 GIT binary patch literal 18142 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 literal 0 HcmV?d00001 diff --git a/samples/swift/ios/FaceDetection/FaceDetectionDynamic.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/samples/swift/ios/FaceDetection/FaceDetectionDynamic.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000000..3d4c1e5525 --- /dev/null +++ b/samples/swift/ios/FaceDetection/FaceDetectionDynamic.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + +