diff --git a/recipes/mongo-cxx-driver/all/conandata.yml b/recipes/mongo-cxx-driver/all/conandata.yml index a503580e8be97..ee816aedb818f 100644 --- a/recipes/mongo-cxx-driver/all/conandata.yml +++ b/recipes/mongo-cxx-driver/all/conandata.yml @@ -2,6 +2,9 @@ sources: "3.6.1": url: https://github.com/mongodb/mongo-cxx-driver/archive/r3.6.1.tar.gz sha256: c6d1b307f7b074d178c4a815d8739195fb4d7870701064bdad6f1f2360ae0af9 + "3.6.2": + url: https://github.com/mongodb/mongo-cxx-driver/archive/r3.6.2.tar.gz + sha256: f50a1acb98a473f0850e2766dc7e84c05415dc63b1a2f851b77b12629ac14d62 patches: "3.6.1": - patch_file: "patches/dirs_and_tests.patch" @@ -10,3 +13,10 @@ patches: base_path: "source_subfolder" - patch_file: "patches/poly_use_std_define.patch" base_path: "source_subfolder" + "3.6.2": + - patch_file: "patches/dirs_and_tests.patch" + base_path: "source_subfolder" + - patch_file: "patches/link_conan_boost.patch" + base_path: "source_subfolder" + - patch_file: "patches/poly_use_std_define.patch" + base_path: "source_subfolder" diff --git a/recipes/mongo-cxx-driver/all/conanfile.py b/recipes/mongo-cxx-driver/all/conanfile.py index 04bc09d83b4e2..2c556f45623fb 100644 --- a/recipes/mongo-cxx-driver/all/conanfile.py +++ b/recipes/mongo-cxx-driver/all/conanfile.py @@ -5,7 +5,7 @@ import shutil -required_conan_version = ">=1.28.0" +required_conan_version = ">=1.32.0" class MongoCxxConan(ConanFile): @@ -89,6 +89,15 @@ def configure(self): if self.options.shared: del self.options.fPIC + def requirements(self): + self.requires("mongo-c-driver/1.17.2") + if self.options.polyfill == "boost": + self.requires("boost/1.75.0") + + def validate(self): + if self.options.with_ssl and not bool(self.options["mongo-c-driver"].with_ssl): + raise ConanInvalidConfiguration("mongo-cxx-driver with_ssl=True requires mongo-c-driver with a ssl implementation") + if self.options.polyfill == "mnmlstc": # TODO: add mnmlstc polyfill support # Cannot model mnmlstc (not packaged, is pulled dynamically) polyfill dependencies @@ -114,11 +123,6 @@ def configure(self): ) ) - def requirements(self): - self.requires("mongo-c-driver/1.17.2") - if self.options.polyfill == "boost": - self.requires("boost/1.74.0") - def source(self): tools.get(**self.conan_data["sources"][self.version]) os.rename(self.name + "-r" + self.version, self._source_subfolder) @@ -153,10 +157,7 @@ def _patch_sources(self): tools.patch(**patch) def build(self): - if self.options.with_ssl and not bool(self.options["mongo-c-driver"].with_ssl): - raise ConanInvalidConfiguration("mongo-cxx-driver with_ssl=True requires mongo-c-driver with a ssl implementation") self._patch_sources() - cmake = self._configure_cmake() cmake.build() diff --git a/recipes/mongo-cxx-driver/config.yml b/recipes/mongo-cxx-driver/config.yml index ffadf2d2ef31f..7f563c21574e3 100644 --- a/recipes/mongo-cxx-driver/config.yml +++ b/recipes/mongo-cxx-driver/config.yml @@ -1,3 +1,5 @@ versions: "3.6.1": folder: all + "3.6.2": + folder: all