Merge branch 'master' into update/proj

.c3i/authorized_users.yml

@@ -1245,3 +1245,4 @@ authorized_users:
 - har-bw
 - abedra
 - bennettgoble
+- juansblanco

.c3i/reviewers.yml

@@ -84,3 +84,6 @@ reviewers:
   - user: "davidsanfal"
     type: "team"
     request_reviews: false
+  - user: "juansblanco"
+    type: "team"
+    request_reviews: false

recipes/c-blosc2/all/conandata.yml

@@ -1,4 +1,7 @@
 sources:
+  "2.11.3":
+    url: "/~https://github.com/Blosc/c-blosc2/archive/v2.11.3.tar.gz"
+    sha256: "7273ec3ab42adc247425ab34b0601db86a6e2a6aa1a97a11e29df02e078f5037"
   "2.11.2":
     url: "/~https://github.com/Blosc/c-blosc2/archive/v2.11.2.tar.gz"
     sha256: "4a508362653468d8948762886c6b24e6bafb70e02709aa31284c0ff9db62b83d"
@@ -27,6 +30,10 @@ sources:
     url: "/~https://github.com/Blosc/c-blosc2/archive/v2.4.3.tar.gz"
     sha256: "d4aa5e0794598794f20ab950e973d44f0d0d9c133ea1a5a07cb200fa54d2e036"
 patches:
+  "2.11.3":
+    - patch_file: "patches/2.11.1-0001-fix-cmake.patch"
+      patch_description: "use cci package"
+      patch_type: "conan"
   "2.11.2":
     - patch_file: "patches/2.11.1-0001-fix-cmake.patch"
       patch_description: "use cci package"

recipes/c-blosc2/config.yml

@@ -1,4 +1,6 @@
 versions:
+  "2.11.3":
+    folder: all
   "2.11.2":
     folder: all
   "2.11.1":

recipes/glaze/all/conandata.yml

@@ -1,4 +1,11 @@
 sources:
+  "1.8.4":
+    url: "/~https://github.com/stephenberry/glaze/archive/v1.8.4.tar.gz"
+    sha256: "794f68d74264ebd4d26c9e1b2a9098134622751a089a45ed5a97d90e58b7d9e6"
+
+  "1.8.3":
+    url: "/~https://github.com/stephenberry/glaze/archive/v1.8.3.tar.gz"
+    sha256: "3f0f6f9393daf29cef2772fadf46d9f22669899ee8f025f17889a22c84d2c6e8"
   "1.8.2":
     url: "/~https://github.com/stephenberry/glaze/archive/v1.8.2.tar.gz"
     sha256: "dddc7b9c87739e0266a6a868316e692975651e9e77684cfb7d3a6a4be32c95fc"

recipes/glaze/config.yml

@@ -1,4 +1,8 @@
 versions:
+  "1.8.4":
+    folder: all
+  "1.8.3":
+    folder: all
   "1.8.2":
     folder: all
   "1.8.1":

recipes/glog/all/conanfile.py

@@ -56,7 +56,7 @@ def requirements(self):
             self.requires("gflags/2.2.2", transitive_headers=True, transitive_libs=True)
         # 0.4.0 requires libunwind unconditionally
         if self.options.get_safe("with_unwind") or (Version(self.version) < "0.5.0" and self.settings.os in ["Linux", "FreeBSD"]):
-            self.requires("libunwind/1.6.2")
+            self.requires("libunwind/1.7.2")
 
     def build_requirements(self):
         if Version(self.version) >= "0.6.0":

recipes/inja/all/conanfile.py

@@ -16,6 +16,7 @@ class InjaConan(ConanFile):
     url = "/~https://github.com/conan-io/conan-center-index"
     description = "Inja is a template engine for modern C++, loosely inspired by jinja for python"
     topics = ("jinja2", "string templates", "templates engine")
+    package_type = "header-library"
     settings = "os", "arch", "compiler", "build_type"
     no_copy_source = True
 
@@ -35,8 +36,11 @@ def _compilers_minimum_version(self):
             "apple-clang": "10",
         }
 
+    def layout(self):
+        basic_layout(self, src_folder="src")
+
     def requirements(self):
-        self.requires("nlohmann_json/3.11.2")
+        self.requires("nlohmann_json/3.11.3")
 
     def package_id(self):
         self.info.clear()
@@ -50,12 +54,8 @@ def validate(self):
                 f"{self.ref} requires C++{self._min_cppstd}, which your compiler does not support."
         )
 
-    def layout(self):
-        basic_layout(self, src_folder="src")
-
     def source(self):
-        get(self, **self.conan_data["sources"][self.version],
-            destination=self.source_folder, strip_root=True)
+        get(self, **self.conan_data["sources"][self.version], strip_root=True)
 
     def build(self):
         pass
@@ -68,9 +68,7 @@ def package_info(self):
         self.cpp_info.set_property("cmake_file_name", "inja")
         self.cpp_info.set_property("cmake_target_name", "pantor::inja")
         self.cpp_info.bindirs = []
-        self.cpp_info.frameworkdirs = []
         self.cpp_info.libdirs = []
-        self.cpp_info.resdirs = []
 
         # TODO: to remove in conan v2 once legacy generators removed
         self.cpp_info.filenames["cmake_find_package"] = "inja"
@@ -82,6 +80,4 @@ def package_info(self):
         self.cpp_info.components["libinja"].set_property("cmake_target_name", "pantor::inja")
         self.cpp_info.components["libinja"].requires = ["nlohmann_json::nlohmann_json"]
         self.cpp_info.components["libinja"].bindirs = []
-        self.cpp_info.components["libinja"].frameworkdirs = []
         self.cpp_info.components["libinja"].libdirs = []
-        self.cpp_info.components["libinja"].resdirs = []

recipes/inja/all/test_package/conanfile.py

@@ -7,13 +7,14 @@
 class TestPackageConan(ConanFile):
     settings = "os", "arch", "compiler", "build_type"
     generators = "CMakeToolchain", "CMakeDeps", "VirtualRunEnv"
-
-    def requirements(self):
-        self.requires(self.tested_reference_str)
+    test_type = "explicit"
 
     def layout(self):
         cmake_layout(self)
 
+    def requirements(self):
+        self.requires(self.tested_reference_str)
+
     def build(self):
         cmake = CMake(self)
         cmake.configure()

recipes/intel-neon2sse/all/conanfile.py

@@ -4,13 +4,17 @@
 from conan.tools.files import copy, get, rmdir
 from os import path
 
+required_conan_version = ">=1.50.0"
+
+
 class IntelNeon2sseConan(ConanFile):
     name = "intel-neon2sse"
     url = "/~https://github.com/conan-io/conan-center-index"
     homepage = "/~https://github.com/intel/ARM_NEON_2_x86_SSE"
     description = "Header only library intended to simplify ARM->IA32 porting"
     license = "BSD-2-Clause"
     topics = "neon", "sse", "port", "translation", "intrinsics"
+    package_type = "header-library"
     settings = "os", "compiler", "build_type", "arch"
     options = {
         "SSE4": [True, False],
@@ -21,16 +25,18 @@ class IntelNeon2sseConan(ConanFile):
         "disable_performance_warnings": False,
     }
 
+    def layout(self):
+        cmake_layout(self, src_folder="src")
+
+    def package_id(self):
+        self.info.clear()
+
     def validate(self):
         if self.settings.arch not in ("x86", "x86_64"):
             raise ConanInvalidConfiguration("neon2sse only supports arch={x86,x86_64}")
 
-    def layout(self):
-        cmake_layout(self, src_folder="src")
-
     def source(self):
-        get(self, **self.conan_data["sources"][self.version],
-            destination=self.source_folder, strip_root=True)
+        get(self, **self.conan_data["sources"][self.version], strip_root=True)
 
     def generate(self):
         tc = CMakeToolchain(self)
@@ -47,13 +53,11 @@ def package(self):
         copy(self, "LICENSE", dst=path.join(self.package_folder, "licenses"), src=self.source_folder)
         rmdir(self, path.join(self.package_folder, "lib"))
 
-    def package_id(self):
-        self.info.clear()
-
     def package_info(self):
+        self.cpp_info.bindirs = []
         self.cpp_info.libdirs = []
         self.cpp_info.set_property("cmake_file_name", "NEON_2_SSE")
-        self.cpp_info.set_property("cmake_target_name", "NEON_2_SSE::NEON_2_SSE")        
+        self.cpp_info.set_property("cmake_target_name", "NEON_2_SSE::NEON_2_SSE")
         if self.options.SSE4:
             self.cpp_info.defines.append("USE_SSE4")
         if self.options.disable_performance_warnings:

recipes/intel-neon2sse/all/test_v1_package/CMakeLists.txt

@@ -1,10 +1,8 @@
-cmake_minimum_required(VERSION 3.1)
-project(test_package C)
+cmake_minimum_required(VERSION 3.15)
+project(test_package)
 
 include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
 conan_basic_setup(TARGETS)
 
-find_package(NEON_2_SSE REQUIRED)
-
-add_executable(${PROJECT_NAME} ../test_package/test_package.c)
-target_link_libraries(${PROJECT_NAME} NEON_2_SSE::NEON_2_SSE)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../test_package
+                 ${CMAKE_CURRENT_BINARY_DIR}/test_package)

recipes/intel-neon2sse/all/test_v1_package/conanfile.py

@@ -3,7 +3,7 @@
 
 class TestPackageConan(ConanFile):
     settings = "os", "compiler", "build_type", "arch"
-    generators = "cmake", "cmake_find_package"
+    generators = "cmake", "cmake_find_package_multi"
 
     def build(self):
         cmake = CMake(self)

recipes/jeaiii-itoa/all/conanfile.py

@@ -15,30 +15,26 @@ class ItoaConan(ConanFile):
     url = "/~https://github.com/conan-io/conan-center-index"
     homepage = "/~https://github.com/jeaiii/itoa/"
     topics = ("string-conversion", "itona", "integer-conversion",)
+    package_type = "header-library"
     settings = "os", "arch", "compiler", "build_type"
     no_copy_source = True
 
     @property
-    def _minimum_cpp_standard(self):
+    def _min_cppstd(self):
         return 17
 
-    def export_sources(self):
-        for p in self.conan_data.get("patches", {}).get(self.version, []):
-            copy(self, p["patch_file"], self.recipe_folder, self.export_sources_folder)
-
     def layout(self):
         basic_layout(self, src_folder="src")
 
     def validate(self):
         if self.settings.compiler.cppstd:
-            check_min_cppstd(self, self._minimum_cpp_standard)
+            check_min_cppstd(self, self._min_cppstd)
 
     def package_id(self):
         self.info.clear()
 
     def source(self):
-        get(self, **self.conan_data["sources"][self.version],
-            destination=self.source_folder, strip_root=True)
+        get(self, **self.conan_data["sources"][self.version], strip_root=True)
 
     def build(self):
         pass
@@ -49,6 +45,4 @@ def package(self):
 
     def package_info(self):
         self.cpp_info.bindirs = []
-        self.cpp_info.frameworkdirs = []
         self.cpp_info.libdirs = []
-        self.cpp_info.resdirs = []

recipes/jeaiii-itoa/all/test_package/CMakeLists.txt

@@ -1,6 +1,5 @@
 cmake_minimum_required(VERSION 3.8)
-
-project(test_package CXX)
+project(test_package LANGUAGES CXX)
 
 find_package(jeaiii-itoa REQUIRED CONFIG)
 

recipes/jeaiii-itoa/all/test_v1_package/CMakeLists.txt

@@ -1,12 +1,8 @@
-cmake_minimum_required(VERSION 3.8)
-
-project(test_package CXX)
+cmake_minimum_required(VERSION 3.15)
+project(test_package)
 
 include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
 conan_basic_setup(TARGETS)
 
-find_package(jeaiii-itoa REQUIRED CONFIG)
-
-add_executable(${PROJECT_NAME} ../test_package/test_package.cpp)
-target_link_libraries(${PROJECT_NAME} PRIVATE jeaiii-itoa::jeaiii-itoa)
-target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_11)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../test_package
+                 ${CMAKE_CURRENT_BINARY_DIR}/test_package)

recipes/jfalcou-eve/all/conanfile.py

@@ -20,6 +20,7 @@ class JfalcouEveConan(ConanFile):
     url = "/~https://github.com/conan-io/conan-center-index"
     homepage = "https://jfalcou.github.io/eve/"
     topics = ("cpp", "simd", "header-only")
+    package_type = "header-library"
     settings = "os", "arch", "compiler", "build_type"
     no_copy_source = True
 

recipes/jsmn/all/conanfile.py

@@ -16,6 +16,7 @@ class JsmnConan(ConanFile):
     topics = ("json", "parser")
     homepage = "/~https://github.com/zserge/jsmn"
     url = "/~https://github.com/conan-io/conan-center-index"
+    package_type = "header-library"
     settings = "os", "arch", "compiler", "build_type"
     no_copy_source = True
 
@@ -26,8 +27,7 @@ def package_id(self):
         self.info.clear()
 
     def source(self):
-        get(self, **self.conan_data["sources"][self.version],
-            destination=self.source_folder, strip_root=True)
+        get(self, **self.conan_data["sources"][self.version], strip_root=True)
 
     def build(self):
         pass

recipes/json_dto/all/conandata.yml

@@ -1,22 +1,22 @@
 sources:
-  "0.2.11":
-    url: "/~https://github.com/Stiffstream/json_dto/archive/v.0.2.11.tar.gz"
-    sha256: "9ce409a8210ee78ef5b1e60dfb919186ba6a2e928e391e46f0e1d36049e06b1c"
-  "0.2.12":
-    url: "/~https://github.com/Stiffstream/json_dto/archive/v.0.2.12.tar.gz"
-    sha256: "3b1ca412a74c339c01bcbf739542fa69b2391d24c321742098a2d6dfa7402d84"
-  "0.2.13":
-    url: "/~https://github.com/Stiffstream/json_dto/archive/v.0.2.13.tar.gz"
-    sha256: "ed4138bf86e0724c95508a9c74bed6fa0c98814b96f4cb3a1b540857e2302663"
-  "0.2.14":
-    url: "/~https://github.com/Stiffstream/json_dto/archive/v.0.2.14.tar.gz"
-    sha256: "d885fe16cf621f7470a45fb6e955e8aded02958bb2212819dc151feac930905b"
-  "0.2.15":
-    url: "/~https://github.com/Stiffstream/json_dto/archive/v.0.2.15.tar.gz"
-    sha256: "d7631d21785ddddc81b2fe04a7998d0d49323c2224168568cb80cc32093da3ac"
-  "0.3.0":
-    url: "/~https://github.com/Stiffstream/json_dto/archive/v.0.3.0.tar.gz"
-    sha256: "cd497c9ee5556c45aaa3402a23ab935e6a90c1e62076562efd0708d1ec8f4c30"
   "0.3.1":
-    url: "/~https://github.com/Stiffstream/json_dto/archive/v.0.3.1.tar.gz"
+    url: "/~https://github.com/Stiffstream/json_dto/archive/refs/tags/v.0.3.1.tar.gz"
     sha256: "515a2d1510d3d8f8b240eb2149f44aeb47a70d26a7071609cca45c0ee198d1d1"
+  "0.3.0":
+    url: "/~https://github.com/Stiffstream/json_dto/archive/refs/tags/v.0.3.0.tar.gz"
+    sha256: "cd497c9ee5556c45aaa3402a23ab935e6a90c1e62076562efd0708d1ec8f4c30"
+  "0.2.15":
+    url: "/~https://github.com/Stiffstream/json_dto/archive/refs/tags/v.0.2.15.tar.gz"
+    sha256: "d7631d21785ddddc81b2fe04a7998d0d49323c2224168568cb80cc32093da3ac"
+  "0.2.14":
+    url: "/~https://github.com/Stiffstream/json_dto/archive/refs/tags/v.0.2.14.tar.gz"
+    sha256: "d885fe16cf621f7470a45fb6e955e8aded02958bb2212819dc151feac930905b"
+  "0.2.13":
+    url: "/~https://github.com/Stiffstream/json_dto/archive/refs/tags/v.0.2.13.tar.gz"
+    sha256: "ed4138bf86e0724c95508a9c74bed6fa0c98814b96f4cb3a1b540857e2302663"
+  "0.2.12":
+    url: "/~https://github.com/Stiffstream/json_dto/archive/refs/tags/v.0.2.12.tar.gz"
+    sha256: "3b1ca412a74c339c01bcbf739542fa69b2391d24c321742098a2d6dfa7402d84"
+  "0.2.11":
+    url: "/~https://github.com/Stiffstream/json_dto/archive/refs/tags/v.0.2.11.tar.gz"
+    sha256: "9ce409a8210ee78ef5b1e60dfb919186ba6a2e928e391e46f0e1d36049e06b1c"

recipes/json_dto/all/conanfile.py

@@ -10,13 +10,14 @@
 required_conan_version = ">=1.52.0"
 
 
-class PackageConan(ConanFile):
+class JsonDtoConan(ConanFile):
     name = "json_dto"
     license = "BSD-3-Clause"
     homepage = "/~https://github.com/Stiffstream/json_dto"
     url = "/~https://github.com/conan-io/conan-center-index"
     description = "A small header-only helper for converting data between json representation and c++ structs"
     topics = ("json", "dto", "serialization")
+    package_type = "header-library"
     settings = "os", "compiler", "build_type", "arch"
     no_copy_source = True
 
@@ -38,7 +39,7 @@ def layout(self):
         basic_layout(self, src_folder="src")
 
     def requirements(self):
-        self.requires("rapidjson/1.1.0", transitive_headers=True)
+        self.requires("rapidjson/1.1.0")
 
     def package_id(self):
         self.info.clear()
@@ -53,7 +54,7 @@ def validate(self):
             )
 
     def source(self):
-        get(self, **self.conan_data["sources"][self.version], destination=self.source_folder, strip_root=True)
+        get(self, **self.conan_data["sources"][self.version], strip_root=True)
 
     def package(self):
         copy(self, pattern="LICENSE", dst=os.path.join(self.package_folder, "licenses"), src=self.source_folder)