Skip to content

Commit

Permalink
Remove corresponding Conan options for static dm libs.
Browse files Browse the repository at this point in the history
  • Loading branch information
PengZheng committed Oct 5, 2023
1 parent 43e3425 commit 09793bb
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,6 @@ class CelixConan(ConanFile):
"build_pushstreams": False,
"build_experimental": False,
"build_celix_dfi": False,
"build_dependency_manager": False,
"build_dependency_manager_cxx": False,
"build_framework": False,
"build_rcm": False,
"build_utils": False,
Expand Down Expand Up @@ -319,13 +317,9 @@ def configure(self):
if options["build_rcm"]:
options["build_utils"] = True

if options["build_launcher"] or options["build_dependency_manager"]:
if options["build_launcher"]:
options["build_framework"] = True

if options["build_dependency_manager_cxx"]:
options["build_framework"] = True
options["celix_cxx14"] = True

if options["build_celix_dfi"]:
options["build_utils"] = True

Expand Down

0 comments on commit 09793bb

Please sign in to comment.