diff --git a/Makefile.all b/Makefile.all index 80e5a5dd8..d296ec6b9 100644 --- a/Makefile.all +++ b/Makefile.all @@ -81,10 +81,10 @@ CONAN_OPTIONS := WITH_ENGINE := 1 ## WITH_VTD -## Usage: make WITH_VTD=0 -## Default: 1 +## Usage: make WITH_VTD=1 +## Default: 0 ## -WITH_VTD := 1 +WITH_VTD := 0 ## BUILD_TESTS ## Usage: make BUILD_TESTS=0 package @@ -139,9 +139,9 @@ ALL_PKGS := $(filter-out engine, ${ALL_PKGS}) CONAN_OPTIONS += -o cloe:with_engine=False endif -ifeq (${WITH_VTD},0) +ifeq (${WITH_VTD},1) ALL_PKGS := $(filter-out plugins/vtd, ${ALL_PKGS}) -CONAN_OPTIONS += -o cloe:with_vtd=False +CONAN_OPTIONS += -o cloe:with_vtd=True endif ifeq (${BUILD_TESTS},0) diff --git a/conanfile.py b/conanfile.py index 0794b9286..a1b9784e1 100644 --- a/conanfile.py +++ b/conanfile.py @@ -18,7 +18,7 @@ class Cloe(ConanFile): default_options = { "test": True, "pedantic": True, - "with_vtd": True, + "with_vtd": False, "with_engine": True, } generators = "cmake"