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

openmvg: workaround to fix "all shared" on Linux #17436

Closed
wants to merge 2 commits into from
Closed

openmvg: workaround to fix "all shared" on Linux #17436

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4188ddb
workaround to fix "all shared" on Linux
SpaceIm May 7, 2023
17bd7c3
Merge branch 'master' into openmvg-linux-shared-workaround
AbrilRBS May 29, 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
5 changes: 5 additions & 0 deletions recipes/openmvg/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
from conan.errors import ConanInvalidConfiguration
from conan.tools.build import check_min_cppstd, valid_min_cppstd
from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
from conan.tools.env import VirtualRunEnv
from conan.tools.files import apply_conandata_patches, copy, export_conandata_patches, get, rename, rm, rmdir
from conan.tools.microsoft import is_msvc
from conan.tools.scm import Version
Expand Down Expand Up @@ -84,6 +85,10 @@ def source(self):
get(self, **self.conan_data["sources"][self.version], strip_root=True)

def generate(self):
# TODO: to remove once https://github.com/conan-io/conan/issues/13560 fixed
if self.settings.os == "Linux":
VirtualRunEnv(self).generate(scope="build")

tc = CMakeToolchain(self)
tc.variables["OpenMVG_BUILD_SHARED"] = self.options.shared
tc.variables["OpenMVG_BUILD_TESTS"] = False
Expand Down