Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build: remove the cmake_dynamic option #932

Merged
merged 2 commits into from
Jun 24, 2023
Merged

build: remove the cmake_dynamic option #932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
524e227
build: remove the cmake_dynamic option
homuler Jun 24, 2023
567607e
chore: remove opencv_world dylibs
homuler Jun 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions .github/workflows/package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,12 +268,6 @@ jobs:
name: ${{ inputs.packageName }}-mediapipe_c.dll
path: Packages/com.github.homuler.mediapipe/Runtime/Plugins

- name: Remove unused meta files
run: |
cd Packages/com.github.homuler.mediapipe/Runtime/Plugins
rm libopencv_world.*.meta
rm opencv_world*.dll.meta

- name: Zip all
run: |
zip -r MediaPipeUnityPlugin-all.zip . -x .git/**\*
Expand Down
81 changes: 0 additions & 81 deletions Packages/com.github.homuler.mediapipe/Runtime/Plugins/libopencv_world.3.4.dylib.meta
View file
Open in desktop

This file was deleted.

76 changes: 0 additions & 76 deletions Packages/com.github.homuler.mediapipe/Runtime/Plugins/libopencv_world.so.meta
View file
Open in desktop

This file was deleted.

63 changes: 0 additions & 63 deletions Packages/com.github.homuler.mediapipe/Runtime/Plugins/opencv_world3416.dll.meta
View file
Open in desktop

This file was deleted.

63 changes: 0 additions & 63 deletions Packages/com.github.homuler.mediapipe/Runtime/Plugins/opencv_world3416d.dll.meta
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,8 +242,7 @@ def _build_linkopt(self):
return ['--linkopt={}'.format(l) for l in self.command_args.linkopt]

def _build_opencv_switch(self):
switch = 'cmake_static' if self.command_args.opencv == 'cmake' else self.command_args.opencv
commands = [f'--@opencv//:switch={switch}']
commands = [f'--@opencv//:switch={self.command_args.opencv}']

return commands

Expand Down Expand Up @@ -432,7 +431,7 @@ def __init__(self):
build_command_parser.add_argument('--resources', action=argparse.BooleanOptionalAction, default=True)
build_command_parser.add_argument('--analyzers', action=argparse.BooleanOptionalAction, default=False, help='Install Roslyn Analyzers')
build_command_parser.add_argument('--compilation_mode', '-c', choices=['fastbuild', 'opt', 'dbg'], default='opt')
build_command_parser.add_argument('--opencv', choices=['local', 'cmake', 'cmake_static', 'cmake_dynamic'], default='local', help='Decide to which OpenCV to link for Desktop native libraries')
build_command_parser.add_argument('--opencv', choices=['local', 'cmake'], default='local', help='Decide to which OpenCV to link for Desktop native libraries')
build_command_parser.add_argument('--solutions', nargs='+',
choices=['face_detection', 'face_mesh', 'iris', 'hands', 'pose', 'holistic', 'selfie_segmentation', 'hair_segmentation', 'object_detection'])
build_command_parser.add_argument('--linkopt', '-l', action='append', help='Linker options')
Expand Down
1 change: 0 additions & 1 deletion mediapipe_api/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,6 @@ pkg_zip(
name = "mediapipe_desktop",
srcs = [
":libmediapipe_c",
"@opencv//:opencv_world_dll",
],
)

Expand Down
Loading