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.

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

Add USE_SHARED_OPENCV and USE_SHARED_ONNXRUNTIME options #185

Merged
merged 6 commits into from
Mar 18, 2023

Conversation

umireon
Copy link
Member

@umireon umireon commented Mar 16, 2023

Flatpak doesn't like ExternalProject.
This change will help us to use pre-built binaries and separately built libraries for Flatpak.
Pkgs, exe, deb will remain to use statically-linked libraries.

@umireon umireon requested a review from royshil March 17, 2023 08:19
Copy link
Collaborator

@royshil royshil left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

some changes to take care of

CMakeLists.txt Outdated Show resolved Hide resolved
CMakeLists.txt Outdated Show resolved Hide resolved
include(cmake/BuildMyOnnxruntime.cmake)
include(cmake/BuildMyOpenCV.cmake)
set(USE_SHARED_ONNXRUNTIME
OFF
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

well instead of OFF here you can simply ${OS_LINUX} and that will turn it on for Linux and off for the others

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I meant that using shared libraries is only for flatpak distribution and I want to keep the deb distribution don't require additional libraries.
I maybe want to rename the flags to USE_SYSTEM_FOO.

CMakeLists.txt Outdated Show resolved Hide resolved
CMakeLists.txt Outdated Show resolved Hide resolved
Copy link
Collaborator

@royshil royshil left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good now
merge at will

@umireon umireon merged commit a355723 into locaal-ai:main Mar 18, 2023
@umireon umireon deleted the umireon.use-shared-library branch March 18, 2023 08:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants