From 17b160b62217e408bb17585895d07fdda8aca9b8 Mon Sep 17 00:00:00 2001 From: Andriy Date: Tue, 4 Aug 2020 15:56:17 +0300 Subject: [PATCH] Update conanfile.py with additional option cbor library has an option to be compiled with custom allocators by adding CBOR_CUSTOM_ALLOC to the cmake command. extend the conanfile.py with ability to specify the option above. --- recipes/libcbor/all/conanfile.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes/libcbor/all/conanfile.py b/recipes/libcbor/all/conanfile.py index e3f15aa028f43..542944e9f82f5 100644 --- a/recipes/libcbor/all/conanfile.py +++ b/recipes/libcbor/all/conanfile.py @@ -15,10 +15,12 @@ class LibCborStackConan(ConanFile): options = { "shared": [True, False], "fPIC": [True, False], + "custom_alloc": [True, False] } default_options = { "shared": False, - "fPIC": True + "fPIC": True, + "custom_alloc": False } generators = "cmake" @@ -51,6 +53,7 @@ def _configure_cmake(self): self._cmake = CMake(self) self._cmake.definitions["WITH_EXAMPLES"] = False self._cmake.definitions["SANITIZE"] = False + self._cmake.definitions["CBOR_CUSTOM_ALLOC"] = self.options.custom_alloc self._cmake.configure(build_folder=self._build_subfolder) return self._cmake