Merge remote-tracking branch 'origin/feature/509-remove-static-dm-lib…

…s' into feature/509-remove-static-dm-libs
apache · Oct 7, 2023 · 955d58f · 955d58f
2 parents 7ece3e9 + 09793bb
commit 955d58f
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/conanfile.py b/conanfile.py
@@ -91,8 +91,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,
@@ -315,13 +313,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