Skip to content

Commit

Permalink
Revert "Always use external dependencies"
Browse files Browse the repository at this point in the history
This reverts commit 1c8d106.
  • Loading branch information
liuzicheng1987 committed Sep 23, 2024
1 parent d1e1031 commit e1fa846
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions recipes/reflectcpp/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,9 @@ def configure(self):
self.options.rm_safe("fPIC")

def requirements(self):
self.requires("ctre/3.9.0", transitive_headers=True)
self.requires("yyjson/0.8.0", transitive_headers=True)
if not self.options.shared:
self.requires("ctre/3.9.0", transitive_headers=True)
self.requires("yyjson/0.8.0", transitive_headers=True)
if self.options.with_cbor:
self.requires("tinycbor/0.6.0", transitive_headers=True)
if self.options.with_flatbuffers:
Expand Down Expand Up @@ -107,7 +108,7 @@ def generate(self):
deps.generate()
tc = CMakeToolchain(self)
tc.cache_variables["REFLECTCPP_BUILD_SHARED"] = self.options.shared
tc.cache_variables["REFLECTCPP_USE_BUNDLED_DEPENDENCIES"] = False
tc.cache_variables["REFLECTCPP_USE_BUNDLED_DEPENDENCIES"] = self.options.shared
tc.cache_variables["REFLECTCPP_USE_VCPKG"] = False
tc.cache_variables["REFLECTCPP_CBOR"] = self.options.with_cbor
tc.cache_variables["REFLECTCPP_FLEXBUFFERS"] = self.options.with_flatbuffers
Expand Down

0 comments on commit e1fa846

Please sign in to comment.