From 256f47b2c7365f5c6472fc00291187c176ecac6b Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Thu, 17 Aug 2023 12:51:59 +0300 Subject: [PATCH 1/3] cn-cbor: add version cci.20200822, remove invalid check_min_cppstd --- recipes/cn-cbor/all/conandata.yml | 7 +++++-- recipes/cn-cbor/all/conanfile.py | 21 ++++++++++++------- recipes/cn-cbor/all/test_package/conanfile.py | 2 +- recipes/cn-cbor/config.yml | 3 ++- 4 files changed, 21 insertions(+), 12 deletions(-) diff --git a/recipes/cn-cbor/all/conandata.yml b/recipes/cn-cbor/all/conandata.yml index 4de861bba88a9..cb7de27f9d377 100644 --- a/recipes/cn-cbor/all/conandata.yml +++ b/recipes/cn-cbor/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "cci.20200822": + url: "https://github.com/jimsch/cn-cbor/archive/f713bf67bcf3e076d47e474ce060252ef8be48c7.zip" + sha256: "7fac4e6a0fcc5e1def08b05a153cc7dbbcab1d26fc0c4b7620d2bed7b4518b05" "1.0.0": - sha256: eca2bcc15b8400037fd95748724287afbb966e34d4d0275a496b4872bcea9d77 - url: https://github.com/jimsch/cn-cbor/archive/1.0.0.zip + url: "https://github.com/jimsch/cn-cbor/archive/1.0.0.zip" + sha256: "eca2bcc15b8400037fd95748724287afbb966e34d4d0275a496b4872bcea9d77" diff --git a/recipes/cn-cbor/all/conanfile.py b/recipes/cn-cbor/all/conanfile.py index 91eccd3167699..d10556f9c9031 100644 --- a/recipes/cn-cbor/all/conanfile.py +++ b/recipes/cn-cbor/all/conanfile.py @@ -2,7 +2,6 @@ from conan import ConanFile from conan.errors import ConanInvalidConfiguration -from conan.tools.build import check_min_cppstd from conan.tools.cmake import CMake, CMakeToolchain, cmake_layout from conan.tools.files import copy, get, rmdir @@ -42,8 +41,6 @@ def layout(self): cmake_layout(self, src_folder="src") def validate(self): - if self.settings.compiler.get_safe("cppstd"): - check_min_cppstd(self, 11) if self.settings.os == "Windows" and self.options.shared: raise ConanInvalidConfiguration("Windows shared builds are not supported right now") @@ -52,10 +49,16 @@ def source(self): def generate(self): tc = CMakeToolchain(self) - tc.variables["fatal_warnings"] = False - tc.variables["coveralls"] = False - tc.variables["build_tests"] = False - tc.variables["build_docs"] = False + tc.variables["CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS"] = self.options.shared + tc.cache_variables["CN_CBOR_FATAL_WARNINGS"] = False + tc.cache_variables["CN_CBOR_COVERALLS"] = False + tc.cache_variables["CN_CBOR_BUILD_TESTS"] = False + tc.cache_variables["CN_CBOR_BUILD_DOCS"] = False + # For v1.0.0 + tc.cache_variables["fatal_warnings"] = False + tc.cache_variables["coveralls"] = False + tc.cache_variables["build_tests"] = False + tc.cache_variables["build_docs"] = False tc.generate() def build(self): @@ -64,7 +67,9 @@ def build(self): cmake.build() def package(self): - copy(self, "LICENSE", dst=os.path.join(self.package_folder, "licenses"), src=self.source_folder) + copy(self, "LICENSE", + dst=os.path.join(self.package_folder, "licenses"), + src=self.source_folder) cmake = CMake(self) cmake.install() os.remove(os.path.join(self.package_folder, "README.md")) diff --git a/recipes/cn-cbor/all/test_package/conanfile.py b/recipes/cn-cbor/all/test_package/conanfile.py index fae501d0afb9e..ef5d7042163ec 100644 --- a/recipes/cn-cbor/all/test_package/conanfile.py +++ b/recipes/cn-cbor/all/test_package/conanfile.py @@ -6,7 +6,7 @@ class TestPackageConan(ConanFile): settings = "os", "arch", "compiler", "build_type" - generators = "CMakeDeps", "CMakeToolchain" + generators = "CMakeDeps", "CMakeToolchain", "VirtualRunEnv" test_type = "explicit" def requirements(self): diff --git a/recipes/cn-cbor/config.yml b/recipes/cn-cbor/config.yml index 8f50af2b049ed..d0b11a75550eb 100644 --- a/recipes/cn-cbor/config.yml +++ b/recipes/cn-cbor/config.yml @@ -1,4 +1,5 @@ ---- versions: + "cci.20200822": + folder: "all" "1.0.0": folder: "all" From fab2f20e7b5eb5187d87271b79d610c050187ea0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20Ram=C3=ADrez?= Date: Thu, 7 Mar 2024 15:36:18 +0100 Subject: [PATCH 2/3] Update recipes/cn-cbor/all/conandata.yml --- recipes/cn-cbor/all/conandata.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/recipes/cn-cbor/all/conandata.yml b/recipes/cn-cbor/all/conandata.yml index cb7de27f9d377..617cedf518b2c 100644 --- a/recipes/cn-cbor/all/conandata.yml +++ b/recipes/cn-cbor/all/conandata.yml @@ -1,7 +1,4 @@ sources: - "cci.20200822": - url: "https://github.com/jimsch/cn-cbor/archive/f713bf67bcf3e076d47e474ce060252ef8be48c7.zip" - sha256: "7fac4e6a0fcc5e1def08b05a153cc7dbbcab1d26fc0c4b7620d2bed7b4518b05" "1.0.0": url: "https://github.com/jimsch/cn-cbor/archive/1.0.0.zip" sha256: "eca2bcc15b8400037fd95748724287afbb966e34d4d0275a496b4872bcea9d77" From 198838ebeb7143ee7ab098d6640412b69f395566 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20Ram=C3=ADrez?= Date: Thu, 7 Mar 2024 15:36:23 +0100 Subject: [PATCH 3/3] Update recipes/cn-cbor/config.yml --- recipes/cn-cbor/config.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipes/cn-cbor/config.yml b/recipes/cn-cbor/config.yml index d0b11a75550eb..c7f13630776fb 100644 --- a/recipes/cn-cbor/config.yml +++ b/recipes/cn-cbor/config.yml @@ -1,5 +1,3 @@ versions: - "cci.20200822": - folder: "all" "1.0.0": folder: "all"