Skip to content

Commit

Permalink
build: remove the cmake_dynamic option (#932)
Browse files Browse the repository at this point in the history
* build: remove the cmake_dynamic option

* chore: remove opencv_world dylibs
  • Loading branch information
homuler committed Jun 24, 2023
1 parent 9d5c618 commit a7517e5
Show file tree
Hide file tree
Showing 8 changed files with 6 additions and 406 deletions.
6 changes: 0 additions & 6 deletions .github/workflows/package.yml
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

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

5 changes: 2 additions & 3 deletions build.py
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
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

0 comments on commit a7517e5

Please sign in to comment.