From 3b056b58af7591e0e04171c3cfd408396fb246fa Mon Sep 17 00:00:00 2001 From: Eric Pederson Date: Fri, 3 Nov 2023 11:24:27 -0400 Subject: [PATCH 01/20] (#17894) librdkafka: fix Visual Studio Debug ssl >= 1.8.0 * librdkafka: fix Windows debug ssl >= 1.8.0 * Missing import * Support Visual Studio or msvc * Update recipes/librdkafka/all/conanfile.py Co-authored-by: Uilian Ries * Update recipes/librdkafka/all/conanfile.py Co-authored-by: Uilian Ries * Update recipes/librdkafka/all/conanfile.py Co-authored-by: Uilian Ries * Use source folder instead of build folder --------- Co-authored-by: Uilian Ries --- recipes/librdkafka/all/conanfile.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/recipes/librdkafka/all/conanfile.py b/recipes/librdkafka/all/conanfile.py index 2e958843569aa0..cd2ea0b4f86306 100644 --- a/recipes/librdkafka/all/conanfile.py +++ b/recipes/librdkafka/all/conanfile.py @@ -1,7 +1,8 @@ from conan import ConanFile from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout from conan.tools.env import VirtualBuildEnv -from conan.tools.files import apply_conandata_patches, copy, export_conandata_patches, get, rmdir +from conan.tools.files import apply_conandata_patches, copy, export_conandata_patches, get, rmdir, replace_in_file +from conan.tools.microsoft import is_msvc from conan.tools.gnu import PkgConfigDeps from conan.tools.scm import Version import os @@ -111,6 +112,12 @@ def generate(self): def build(self): apply_conandata_patches(self) + # There are references to libcrypto.lib and libssl.lib in rdkafka_ssl.c for versions >= 1.8.0 + if Version(self.version) >= "1.8.0" and is_msvc(self) and \ + self.settings.build_type == "Debug" and self.options.get_safe("ssl", False): + rdkafka_ssl_path = os.path.join(self.source_folder, "src", "rdkafka_ssl.c") + replace_in_file(self, rdkafka_ssl_path, "libcrypto.lib", "libcryptod.lib") + replace_in_file(self, rdkafka_ssl_path, "libssl.lib", "libssld.lib") cmake = CMake(self) cmake.configure() cmake.build() From 33777a874144ec3e7c34cb590e1cc0c0fe3f5966 Mon Sep 17 00:00:00 2001 From: toge Date: Sat, 4 Nov 2023 01:38:12 +0900 Subject: [PATCH 02/20] (#20914) glaze: add version 1.5.7 --- recipes/glaze/all/conandata.yml | 3 +++ recipes/glaze/config.yml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/recipes/glaze/all/conandata.yml b/recipes/glaze/all/conandata.yml index 28e6b036ed8eca..d8c540e579afd2 100644 --- a/recipes/glaze/all/conandata.yml +++ b/recipes/glaze/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "1.5.7": + url: "https://github.com/stephenberry/glaze/archive/v1.5.7.tar.gz" + sha256: "3bd40d0a2547fb9ee0fb94894dc13ba0bc37dac6d26ee292941e7a5203702c84" "1.5.6": url: "https://github.com/stephenberry/glaze/archive/v1.5.6.tar.gz" sha256: "11910435f078a2be66c451413203097197991a4c2d0e5ec5b3e81f5568bfe64d" diff --git a/recipes/glaze/config.yml b/recipes/glaze/config.yml index 8d7f5144cf8c60..fd8a761b3ff21d 100644 --- a/recipes/glaze/config.yml +++ b/recipes/glaze/config.yml @@ -1,4 +1,6 @@ versions: + "1.5.7": + folder: all "1.5.6": folder: all "1.5.3": From 3f739e125ea17c93ece5fa4105e194706c0dbbce Mon Sep 17 00:00:00 2001 From: gmeeker Date: Fri, 3 Nov 2023 12:27:57 -0700 Subject: [PATCH 03/20] (#20907) (#20906) nsimd: conan v2 support * (#20906) nsimd: conan v2 support * nsimd: Add cmake_layout src_folder --- recipes/nsimd/2.x/CMakeLists.txt | 7 -- recipes/nsimd/2.x/conanfile.py | 72 +++++++++---------- recipes/nsimd/2.x/test_package/CMakeLists.txt | 3 - recipes/nsimd/2.x/test_package/conanfile.py | 20 ++++-- .../nsimd/2.x/test_v1_package/CMakeLists.txt | 10 +++ .../nsimd/2.x/test_v1_package/conanfile.py | 18 +++++ 6 files changed, 75 insertions(+), 55 deletions(-) delete mode 100644 recipes/nsimd/2.x/CMakeLists.txt create mode 100644 recipes/nsimd/2.x/test_v1_package/CMakeLists.txt create mode 100644 recipes/nsimd/2.x/test_v1_package/conanfile.py diff --git a/recipes/nsimd/2.x/CMakeLists.txt b/recipes/nsimd/2.x/CMakeLists.txt deleted file mode 100644 index c986d294c75479..00000000000000 --- a/recipes/nsimd/2.x/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -cmake_minimum_required(VERSION 3.1) -project(cmake_wrapper) - -include(conanbuildinfo.cmake) -conan_basic_setup() - -add_subdirectory("source_subfolder") diff --git a/recipes/nsimd/2.x/conanfile.py b/recipes/nsimd/2.x/conanfile.py index 517dd7d55ea046..714275e3c3205b 100644 --- a/recipes/nsimd/2.x/conanfile.py +++ b/recipes/nsimd/2.x/conanfile.py @@ -1,5 +1,7 @@ import os -from conans import ConanFile, CMake, tools +from conan import ConanFile +from conan.tools.cmake import CMake, CMakeToolchain, cmake_layout +from conan.tools.files import collect_libs, copy, get, replace_in_file required_conan_version = ">=1.33.0" @@ -11,8 +13,6 @@ class NsimdConan(ConanFile): topics = ("hpc", "neon", "cuda", "avx", "simd", "avx2", "sse2", "aarch64", "avx512", "sse42", "rocm", "sve", "neon128") url = "https://github.com/conan-io/conan-center-index" license = "MIT" - exports_sources = ["CMakeLists.txt", "patches/*"] - generators = "cmake" settings = "os", "compiler", "build_type", "arch" options = { "shared": [True, False], @@ -27,63 +27,57 @@ class NsimdConan(ConanFile): "simd": None } - _cmake = None - - @property - def _source_subfolder(self): - return "source_subfolder" - - @property - def _build_subfolder(self): - return "build_subfolder" - def config_options(self): if self.settings.os == "Windows": del self.options.fPIC def configure(self): if self.options.shared: - del self.options.fPIC + self.options.rm_safe("fPIC") # Most of the library is header only. # cpp files do not use STL. - del self.settings.compiler.libcxx + self.settings.rm_safe("compiler.libcxx") + self.settings.rm_safe("compiler.cppstd") + + def layout(self): + cmake_layout(self, src_folder="src") def source(self): - tools.get(**self.conan_data["sources"][self.version], strip_root=True, destination=self._source_subfolder) + get(self, **self.conan_data["sources"][self.version], + destination=self.source_folder, strip_root=True) - def _configure_cmake(self): - if self._cmake: - return self._cmake - self._cmake = CMake(self) + def generate(self): + tc = CMakeToolchain(self) if self.options.simd: - self._cmake.definitions["simd"] = self.options.simd + tc.variables["simd"] = self.options.simd if self.settings.arch == "armv7hf": - self._cmake.definitions["NSIMD_ARM32_IS_ARMEL"] = False - self._cmake.definitions["CMAKE_POSITION_INDEPENDENT_CODE"] = self.options.get_safe("fPIC", True) - self._cmake.configure(build_folder=self._build_subfolder) - return self._cmake + tc.variables["NSIMD_ARM32_IS_ARMEL"] = False + tc.variables["CMAKE_POSITION_INDEPENDENT_CODE"] = self.options.get_safe("fPIC", True) + tc.generate() def _patch_sources(self): - cmakefile_path = os.path.join(self._source_subfolder, "CMakeLists.txt") - tools.replace_in_file(cmakefile_path, - " SHARED ", - " ") - tools.replace_in_file(cmakefile_path, - "RUNTIME DESTINATION lib", - "RUNTIME DESTINATION bin") - tools.replace_in_file(cmakefile_path, - "set_property(TARGET ${o} PROPERTY POSITION_INDEPENDENT_CODE ON)", - "") + cmakefile_path = os.path.join(self.source_folder, "CMakeLists.txt") + replace_in_file(self, cmakefile_path, + " SHARED ", + " ") + replace_in_file(self, cmakefile_path, + "RUNTIME DESTINATION lib", + "RUNTIME DESTINATION bin") + replace_in_file(self, cmakefile_path, + "set_property(TARGET ${o} PROPERTY POSITION_INDEPENDENT_CODE ON)", + "") def build(self): self._patch_sources() - cmake = self._configure_cmake() + cmake = CMake(self) + cmake.configure() cmake.build() def package(self): - self.copy("LICENSE", dst="licenses", src=self._source_subfolder) - cmake = self._configure_cmake() + copy(self, "LICENSE", src=self.source_folder, + dst=os.path.join(self.package_folder, "licenses")) + cmake = CMake(self) cmake.install() def package_info(self): - self.cpp_info.libs = tools.collect_libs(self) + self.cpp_info.libs = collect_libs(self) diff --git a/recipes/nsimd/2.x/test_package/CMakeLists.txt b/recipes/nsimd/2.x/test_package/CMakeLists.txt index aac673c26f6fe1..6f3111e50d3efc 100644 --- a/recipes/nsimd/2.x/test_package/CMakeLists.txt +++ b/recipes/nsimd/2.x/test_package/CMakeLists.txt @@ -1,9 +1,6 @@ cmake_minimum_required(VERSION 3.1) project(test_package CXX) -include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) -conan_basic_setup(TARGETS) - find_package(nsimd CONFIG REQUIRED) add_executable(${PROJECT_NAME} test_package.cpp) diff --git a/recipes/nsimd/2.x/test_package/conanfile.py b/recipes/nsimd/2.x/test_package/conanfile.py index 0937dd58a343bd..22e1a75b926d7b 100644 --- a/recipes/nsimd/2.x/test_package/conanfile.py +++ b/recipes/nsimd/2.x/test_package/conanfile.py @@ -1,11 +1,19 @@ +from conan import ConanFile +from conan.tools.build import can_run +from conan.tools.cmake import CMake, cmake_layout import os -from conans import ConanFile, CMake, tools - class NsimdTestConan(ConanFile): settings = "os", "compiler", "build_type", "arch" - generators = "cmake", "cmake_find_package_multi" + generators = "CMakeToolchain", "CMakeDeps", "VirtualRunEnv" + test_type = "explicit" + + def layout(self): + cmake_layout(self) + + def requirements(self): + self.requires(self.tested_reference_str) def build(self): cmake = CMake(self) @@ -13,6 +21,6 @@ def build(self): cmake.build() def test(self): - if not tools.cross_building(self): - bin_path = os.path.join("bin", "test_package") - self.run(bin_path, run_environment=True) + if can_run(self): + bin_path = os.path.join(self.cpp.build.bindirs[0], "test_package") + self.run(bin_path, env="conanrun") diff --git a/recipes/nsimd/2.x/test_v1_package/CMakeLists.txt b/recipes/nsimd/2.x/test_v1_package/CMakeLists.txt new file mode 100644 index 00000000000000..ed8a6b4ca24f67 --- /dev/null +++ b/recipes/nsimd/2.x/test_v1_package/CMakeLists.txt @@ -0,0 +1,10 @@ +cmake_minimum_required(VERSION 3.1) +project(test_package CXX) + +include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) +conan_basic_setup(TARGETS) + +find_package(nsimd CONFIG REQUIRED) + +add_executable(${PROJECT_NAME} ../test_package/test_package.cpp) +target_link_libraries(${PROJECT_NAME} nsimd::nsimd) diff --git a/recipes/nsimd/2.x/test_v1_package/conanfile.py b/recipes/nsimd/2.x/test_v1_package/conanfile.py new file mode 100644 index 00000000000000..0937dd58a343bd --- /dev/null +++ b/recipes/nsimd/2.x/test_v1_package/conanfile.py @@ -0,0 +1,18 @@ +import os + +from conans import ConanFile, CMake, tools + + +class NsimdTestConan(ConanFile): + settings = "os", "compiler", "build_type", "arch" + generators = "cmake", "cmake_find_package_multi" + + def build(self): + cmake = CMake(self) + cmake.configure() + cmake.build() + + def test(self): + if not tools.cross_building(self): + bin_path = os.path.join("bin", "test_package") + self.run(bin_path, run_environment=True) From 625773c145bb485df61d2503b5c195a0f5c3af37 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Fri, 3 Nov 2023 22:19:34 +0200 Subject: [PATCH 04/20] (#18084) accellera-uvm-systemc: migrate to Conan v2 * accellera-uvm-systemc: migrate to Conan v2 * accellera-uvm-systemc: define sc_main in test_package to fix shared build --- .../accellera-uvm-systemc/all/conanfile.py | 90 ++++++++++--------- .../all/test_package/CMakeLists.txt | 6 +- .../all/test_package/conanfile.py | 26 ++++-- .../all/test_package/example.cpp | 9 +- .../all/test_v1_package/CMakeLists.txt | 8 ++ .../all/test_v1_package/conanfile.py | 18 ++++ 6 files changed, 101 insertions(+), 56 deletions(-) create mode 100644 recipes/accellera-uvm-systemc/all/test_v1_package/CMakeLists.txt create mode 100644 recipes/accellera-uvm-systemc/all/test_v1_package/conanfile.py diff --git a/recipes/accellera-uvm-systemc/all/conanfile.py b/recipes/accellera-uvm-systemc/all/conanfile.py index 15689e9fd7ded7..edae984b0d813c 100644 --- a/recipes/accellera-uvm-systemc/all/conanfile.py +++ b/recipes/accellera-uvm-systemc/all/conanfile.py @@ -1,74 +1,80 @@ +import os + from conan import ConanFile -from conans import AutoToolsBuildEnvironment -from conan.tools.files import get, rmdir, rm, copy, rename -from conan.tools.scm import Version -from conan.tools.build import check_min_cppstd from conan.errors import ConanInvalidConfiguration -import os +from conan.tools.apple import is_apple_os +from conan.tools.build import check_min_cppstd +from conan.tools.files import get, rmdir, rm, copy, rename, replace_in_file +from conan.tools.gnu import Autotools, AutotoolsToolchain +from conan.tools.layout import basic_layout +from conan.tools.scm import Version + +required_conan_version = ">=1.53.0" -required_conan_version = ">=1.50.0" class UvmSystemC(ConanFile): name = "accellera-uvm-systemc" - description = """Universal Verification Methodology for SystemC""" - homepage = "https://systemc.org/about/systemc-verification/uvm-systemc-faq" - url = "https://github.com/conan-io/conan-center-index" + description = "Universal Verification Methodology for SystemC" license = "Apache-2.0" + url = "https://github.com/conan-io/conan-center-index" + homepage = "https://systemc.org/overview/uvm-systemc-faq" topics = ("systemc", "verification", "tlm", "uvm") - settings = "os", "compiler", "build_type", "arch" + + package_type = "library" + settings = "os", "arch", "compiler", "build_type" options = { - "fPIC": [True, False], "shared": [True, False], + "fPIC": [True, False], } default_options = { - "fPIC": True, "shared": False, + "fPIC": True, } - @property - def _source_subfolder(self): - return "source_subfolder" + def configure(self): + if self.options.shared: + self.options.rm_safe("fPIC") + + def layout(self): + basic_layout(self, src_folder="src") def requirements(self): - self.requires("systemc/2.3.3") - - def build_requirements(self): - self.tool_requires("cmake/3.24.0") + self.requires("systemc/2.3.4", transitive_headers=True, transitive_libs=True) - def configure(self): - if self.options.shared: - del self.options.fPIC - def validate(self): - if self.settings.os == "Macos": - raise ConanInvalidConfiguration("Macos build not supported") - if self.settings.os == "Windows": - raise ConanInvalidConfiguration("Windows build not yet supported") + if self.settings.os == "Windows" or is_apple_os(self): + raise ConanInvalidConfiguration(f"{self.settings.os} build not supported") if self.settings.compiler.get_safe("cppstd"): check_min_cppstd(self, 11) if self.settings.compiler == "gcc" and Version(self.settings.compiler.version) < "7": raise ConanInvalidConfiguration("GCC < version 7 is not supported") def source(self): - get(self, **self.conan_data["sources"][self.version], - strip_root=True, destination=self._source_subfolder) + get(self, **self.conan_data["sources"][self.version], strip_root=True) + + def generate(self): + tc = AutotoolsToolchain(self) + systemc_root = self.dependencies["systemc"].package_folder + tc.configure_args.append(f"--with-systemc={systemc_root}") + tc.generate() def build(self): - autotools = AutoToolsBuildEnvironment(self) - args = [f"--with-systemc={self.deps_cpp_info['systemc'].rootpath}"] - if self.options.shared: - args.extend(["--enable-shared", "--disable-static"]) - else: - args.extend(["--enable-static", "--disable-shared"]) - autotools.configure(configure_dir=self._source_subfolder, args=args) + autotools = Autotools(self) + autotools.configure() + # Replace lib-linux64/ with lib/ for the systemc dependency + replace_in_file(self, os.path.join(self.build_folder, "src", "uvmsc", "Makefile"), + "-linux64", "") autotools.make() def package(self): - copy(self, "LICENSE", src=os.path.join(self.build_folder, self._source_subfolder), dst=os.path.join(self.package_folder, "licenses")) - copy(self, "NOTICE", src=os.path.join(self.build_folder, self._source_subfolder), dst=os.path.join(self.package_folder, "licenses")) - copy(self, "COPYING", src=os.path.join(self.build_folder, self._source_subfolder), dst=os.path.join(self.package_folder, "licenses")) - autotools = AutoToolsBuildEnvironment(self) + for license in ["LICENSE", "NOTICE", "COPYING"]: + copy(self, license, + src=self.source_folder, + dst=os.path.join(self.package_folder, "licenses")) + + autotools = Autotools(self) autotools.install() + rmdir(self, os.path.join(self.package_folder, "docs")) rmdir(self, os.path.join(self.package_folder, "examples")) rm(self, "AUTHORS", self.package_folder) @@ -80,7 +86,9 @@ def package(self): rm(self, "RELEASENOTES", self.package_folder) rm(self, "README", self.package_folder) rm(self, "INSTALL", self.package_folder) - rename(self, os.path.join(self.package_folder, "lib-linux64"), os.path.join(self.package_folder, "lib")) + rename(self, + os.path.join(self.package_folder, "lib-linux64"), + os.path.join(self.package_folder, "lib")) rm(self, "libuvm-systemc.la", os.path.join(self.package_folder, "lib")) rmdir(self, os.path.join(self.package_folder, "lib", "pkgconfig")) diff --git a/recipes/accellera-uvm-systemc/all/test_package/CMakeLists.txt b/recipes/accellera-uvm-systemc/all/test_package/CMakeLists.txt index 29a5f29bd60627..0dbdd7f01d3404 100644 --- a/recipes/accellera-uvm-systemc/all/test_package/CMakeLists.txt +++ b/recipes/accellera-uvm-systemc/all/test_package/CMakeLists.txt @@ -1,10 +1,8 @@ -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.15) project(test_package LANGUAGES CXX) -include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) -conan_basic_setup(TARGETS) - find_package(accellera-uvm-systemc REQUIRED CONFIG) add_executable(${PROJECT_NAME} example.cpp) target_link_libraries(${PROJECT_NAME} accellera-uvm-systemc::accellera-uvm-systemc) +target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_11) diff --git a/recipes/accellera-uvm-systemc/all/test_package/conanfile.py b/recipes/accellera-uvm-systemc/all/test_package/conanfile.py index 7c46504cf008f9..ef5d7042163ecc 100644 --- a/recipes/accellera-uvm-systemc/all/test_package/conanfile.py +++ b/recipes/accellera-uvm-systemc/all/test_package/conanfile.py @@ -1,18 +1,26 @@ +from conan import ConanFile +from conan.tools.build import can_run +from conan.tools.cmake import cmake_layout, CMake import os -from conans import ConanFile, CMake -from conan.tools.build import cross_building -class UvmSystemcTestConan(ConanFile): - settings = "os", "compiler", "build_type", "arch" - generators = "cmake", "cmake_find_package_multi" - +class TestPackageConan(ConanFile): + settings = "os", "arch", "compiler", "build_type" + generators = "CMakeDeps", "CMakeToolchain", "VirtualRunEnv" + test_type = "explicit" + + def requirements(self): + self.requires(self.tested_reference_str) + + def layout(self): + cmake_layout(self) + def build(self): cmake = CMake(self) cmake.configure() cmake.build() def test(self): - if not cross_building(self): - bin_path = os.path.join("bin", "test_package") - self.run(bin_path, run_environment=True) + if can_run(self): + bin_path = os.path.join(self.cpp.build.bindir, "test_package") + self.run(bin_path, env="conanrun") diff --git a/recipes/accellera-uvm-systemc/all/test_package/example.cpp b/recipes/accellera-uvm-systemc/all/test_package/example.cpp index db58543c274009..47640ade3dcac7 100644 --- a/recipes/accellera-uvm-systemc/all/test_package/example.cpp +++ b/recipes/accellera-uvm-systemc/all/test_package/example.cpp @@ -1,12 +1,17 @@ #include "uvmsc/base/uvm_version.h" +#include "systemc" #include using namespace uvm; +// Required for linking with SystemC +int sc_main(int, char*[]) +{ + return 0; +} + int main(int, char*[]) { std::cout << "uvm-systemc version " << uvm_revision_string() << " loaded successfully."; - return 0; } - diff --git a/recipes/accellera-uvm-systemc/all/test_v1_package/CMakeLists.txt b/recipes/accellera-uvm-systemc/all/test_v1_package/CMakeLists.txt new file mode 100644 index 00000000000000..91630d79f4abb3 --- /dev/null +++ b/recipes/accellera-uvm-systemc/all/test_v1_package/CMakeLists.txt @@ -0,0 +1,8 @@ +cmake_minimum_required(VERSION 3.15) +project(test_package) + +include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) +conan_basic_setup(TARGETS) + +add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../test_package/ + ${CMAKE_CURRENT_BINARY_DIR}/test_package/) diff --git a/recipes/accellera-uvm-systemc/all/test_v1_package/conanfile.py b/recipes/accellera-uvm-systemc/all/test_v1_package/conanfile.py new file mode 100644 index 00000000000000..7c46504cf008f9 --- /dev/null +++ b/recipes/accellera-uvm-systemc/all/test_v1_package/conanfile.py @@ -0,0 +1,18 @@ +import os + +from conans import ConanFile, CMake +from conan.tools.build import cross_building + +class UvmSystemcTestConan(ConanFile): + settings = "os", "compiler", "build_type", "arch" + generators = "cmake", "cmake_find_package_multi" + + def build(self): + cmake = CMake(self) + cmake.configure() + cmake.build() + + def test(self): + if not cross_building(self): + bin_path = os.path.join("bin", "test_package") + self.run(bin_path, run_environment=True) From ce0ac8b6e5f667b5399aaec0f352a43910c9f092 Mon Sep 17 00:00:00 2001 From: toge Date: Sat, 4 Nov 2023 17:20:41 +0900 Subject: [PATCH 05/20] (#20917) aws-c-common: add version 0.9.6 --- recipes/aws-c-common/all/conandata.yml | 3 +++ recipes/aws-c-common/config.yml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/recipes/aws-c-common/all/conandata.yml b/recipes/aws-c-common/all/conandata.yml index 92698304089d55..a4f84c0d2b54b7 100644 --- a/recipes/aws-c-common/all/conandata.yml +++ b/recipes/aws-c-common/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "0.9.6": + url: "https://github.com/awslabs/aws-c-common/archive/v0.9.6.tar.gz" + sha256: "5c30cc066a7f05fb8e4728f93aeed0e0e2698197a6df76237ac4e1200977d090" "0.9.3": url: "https://github.com/awslabs/aws-c-common/archive/v0.9.3.tar.gz" sha256: "389eaac7f64d7d5a91ca3decad6810429eb5a65bbba54798b9beffcb4d1d1ed6" diff --git a/recipes/aws-c-common/config.yml b/recipes/aws-c-common/config.yml index e70a8039b9bc5a..b1a76829e3fbe9 100644 --- a/recipes/aws-c-common/config.yml +++ b/recipes/aws-c-common/config.yml @@ -1,4 +1,6 @@ versions: + "0.9.6": + folder: all "0.9.3": folder: all "0.9.0": From bee5071f33a4ae6b25eb383c82b486ced498e4e7 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Sat, 4 Nov 2023 12:33:43 +0200 Subject: [PATCH 06/20] (#20319) hayai: add a new recipe * hayai: add a new recipe * hayai: fix project() and cmake_minimum_required() order * hayai: disable tests and samples, fix shared build on Windows * hayai: make test_package faster --- recipes/hayai/all/conandata.yml | 9 +++ recipes/hayai/all/conanfile.py | 69 +++++++++++++++++++ .../hayai/all/patches/fix-cmake-project.patch | 8 +++ recipes/hayai/all/test_package/CMakeLists.txt | 8 +++ recipes/hayai/all/test_package/conanfile.py | 26 +++++++ .../hayai/all/test_package/test_package.cpp | 8 +++ recipes/hayai/config.yml | 3 + 7 files changed, 131 insertions(+) create mode 100644 recipes/hayai/all/conandata.yml create mode 100644 recipes/hayai/all/conanfile.py create mode 100644 recipes/hayai/all/patches/fix-cmake-project.patch create mode 100644 recipes/hayai/all/test_package/CMakeLists.txt create mode 100644 recipes/hayai/all/test_package/conanfile.py create mode 100644 recipes/hayai/all/test_package/test_package.cpp create mode 100644 recipes/hayai/config.yml diff --git a/recipes/hayai/all/conandata.yml b/recipes/hayai/all/conandata.yml new file mode 100644 index 00000000000000..490eb3204ef39a --- /dev/null +++ b/recipes/hayai/all/conandata.yml @@ -0,0 +1,9 @@ +sources: + "cci.20190823": + url: "https://github.com/nickbruun/hayai/archive/9bdca1c693e950ab2cb17c4ef885792c3c530234.tar.gz" + sha256: "3e4b703b675a30338c73d9b207824cebd6275de9757eb8eefeef892e863c242f" +patches: + "cci.20190823": + - patch_file: "patches/fix-cmake-project.patch" + patch_description: "Move cmake_minimum_required() before project() in CMakeLists.txt" + patch_type: "conan" diff --git a/recipes/hayai/all/conanfile.py b/recipes/hayai/all/conanfile.py new file mode 100644 index 00000000000000..f9c7ed8eb904b0 --- /dev/null +++ b/recipes/hayai/all/conanfile.py @@ -0,0 +1,69 @@ +import os + +from conan import ConanFile +from conan.tools.cmake import CMake, CMakeToolchain, cmake_layout +from conan.tools.files import get, copy, rm, rmdir, export_conandata_patches, apply_conandata_patches + +required_conan_version = ">=1.53.0" + + +class HayaiConan(ConanFile): + name = "hayai" + description = "C++ benchmarking framework" + license = "Apache" + url = "https://github.com/conan-io/conan-center-index" + homepage = "https://github.com/nickbruun/hayai" + topics = ("benchmarking",) + + package_type = "library" + settings = "os", "arch", "compiler", "build_type" + options = { + "shared": [True, False], + "fPIC": [True, False], + } + default_options = { + "shared": False, + "fPIC": True, + } + + def export_sources(self): + export_conandata_patches(self) + + def config_options(self): + if self.settings.os == "Windows": + del self.options.fPIC + + def configure(self): + if self.options.shared: + self.options.rm_safe("fPIC") + + def layout(self): + cmake_layout(self, src_folder="src") + + def source(self): + get(self, **self.conan_data["sources"][self.version], strip_root=True) + + def generate(self): + tc = CMakeToolchain(self) + tc.cache_variables["BUILD_HAYAI_TESTS"] = False + tc.cache_variables["BUILD_HAYAI_SAMPLES"] = False + tc.variables["CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS"] = True + tc.generate() + + def build(self): + apply_conandata_patches(self) + cmake = CMake(self) + cmake.configure() + cmake.build() + + def package(self): + copy(self, "LICENSE.md", dst=os.path.join(self.package_folder, "licenses"), src=self.source_folder) + cmake = CMake(self) + cmake.install() + rmdir(self, os.path.join(self.package_folder, "lib", "CMake")) + rmdir(self, os.path.join(self.package_folder, "CMake")) + rm(self, "*.pdb", self.package_folder, recursive=True) + + def package_info(self): + self.cpp_info.libs = ["hayai_main"] + self.cpp_info.set_property("cmake_target_name", "hayai_main") diff --git a/recipes/hayai/all/patches/fix-cmake-project.patch b/recipes/hayai/all/patches/fix-cmake-project.patch new file mode 100644 index 00000000000000..f2e12a251e0b89 --- /dev/null +++ b/recipes/hayai/all/patches/fix-cmake-project.patch @@ -0,0 +1,8 @@ +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -3,3 +3,2 @@ +-project(hayai) +-cmake_minimum_required(VERSION 2.4) +-cmake_policy(SET CMP0012 NEW) ++cmake_minimum_required(VERSION 3.15) ++project(hayai CXX) diff --git a/recipes/hayai/all/test_package/CMakeLists.txt b/recipes/hayai/all/test_package/CMakeLists.txt new file mode 100644 index 00000000000000..500852dd444f21 --- /dev/null +++ b/recipes/hayai/all/test_package/CMakeLists.txt @@ -0,0 +1,8 @@ +cmake_minimum_required(VERSION 3.15) +project(test_package CXX) + +find_package(hayai REQUIRED CONFIG) + +add_executable(${PROJECT_NAME} test_package.cpp) +target_link_libraries(${PROJECT_NAME} PRIVATE hayai_main) +target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_11) diff --git a/recipes/hayai/all/test_package/conanfile.py b/recipes/hayai/all/test_package/conanfile.py new file mode 100644 index 00000000000000..ef5d7042163ecc --- /dev/null +++ b/recipes/hayai/all/test_package/conanfile.py @@ -0,0 +1,26 @@ +from conan import ConanFile +from conan.tools.build import can_run +from conan.tools.cmake import cmake_layout, CMake +import os + + +class TestPackageConan(ConanFile): + settings = "os", "arch", "compiler", "build_type" + generators = "CMakeDeps", "CMakeToolchain", "VirtualRunEnv" + test_type = "explicit" + + def requirements(self): + self.requires(self.tested_reference_str) + + def layout(self): + cmake_layout(self) + + def build(self): + cmake = CMake(self) + cmake.configure() + cmake.build() + + def test(self): + if can_run(self): + bin_path = os.path.join(self.cpp.build.bindir, "test_package") + self.run(bin_path, env="conanrun") diff --git a/recipes/hayai/all/test_package/test_package.cpp b/recipes/hayai/all/test_package/test_package.cpp new file mode 100644 index 00000000000000..32f9269a28efce --- /dev/null +++ b/recipes/hayai/all/test_package/test_package.cpp @@ -0,0 +1,8 @@ +#include + +#include +#include + +BENCHMARK(SomeSleep, Sleep1ms, 5, 10) { + std::this_thread::sleep_for(std::chrono::milliseconds(1)); +} diff --git a/recipes/hayai/config.yml b/recipes/hayai/config.yml new file mode 100644 index 00000000000000..524a9c8112de10 --- /dev/null +++ b/recipes/hayai/config.yml @@ -0,0 +1,3 @@ +versions: + "cci.20190823": + folder: all From c4786a889bb9bd26681ebabf4676a64ae12d79d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Jos=C3=A9=20Casafranca?= Date: Sat, 4 Nov 2023 11:49:07 +0100 Subject: [PATCH 07/20] (#20904) [highfive] Bump version to 2.8.0 --- recipes/highfive/all/conandata.yml | 3 +++ recipes/highfive/all/conanfile.py | 3 +++ recipes/highfive/config.yml | 2 ++ 3 files changed, 8 insertions(+) diff --git a/recipes/highfive/all/conandata.yml b/recipes/highfive/all/conandata.yml index b9befb53e74d38..edcf1ebb04b99d 100644 --- a/recipes/highfive/all/conandata.yml +++ b/recipes/highfive/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "2.8.0": + url: "https://github.com/BlueBrain/HighFive/archive/refs/tags/v2.8.0.tar.gz" + sha256: "cd2502cae61bfb00e32dd18c9dc75289e09ad1db5c2a46d3b0eefd32e0df983b" "2.7.1": url: "https://github.com/BlueBrain/HighFive/archive/refs/tags/v2.7.1.tar.gz" sha256: "25b4c51a94d1e670dc93b9b73f51e79b65d8ff49bcd6e5d5582d5ecd2789a249" diff --git a/recipes/highfive/all/conanfile.py b/recipes/highfive/all/conanfile.py index 6057d00c5e0a9b..5a1f607f99989e 100644 --- a/recipes/highfive/all/conanfile.py +++ b/recipes/highfive/all/conanfile.py @@ -22,12 +22,14 @@ class HighFiveConan(ConanFile): "with_eigen": [True, False], "with_xtensor": [True, False], "with_opencv": [True, False], + "with_static_hdf5": [True, False], } default_options = { "with_boost": True, "with_eigen": True, "with_xtensor": True, "with_opencv": False, + "with_static_hdf5": False, } def layout(self): @@ -65,6 +67,7 @@ def generate(self): tc.variables["HIGHFIVE_EXAMPLES"] = False tc.variables["HIGHFIVE_BUILD_DOCS"] = False tc.variables["HIGHFIVE_USE_INSTALL_DEPS"] = False + tc.variables["HIGHFIVE_STATIC_HDF5"] = self.options.with_static_hdf5 tc.generate() deps = CMakeDeps(self) deps.generate() diff --git a/recipes/highfive/config.yml b/recipes/highfive/config.yml index 546cbf2ce6f7b4..28a0e4f7fb1d00 100644 --- a/recipes/highfive/config.yml +++ b/recipes/highfive/config.yml @@ -1,4 +1,6 @@ versions: + "2.8.0": + folder: all "2.7.1": folder: all "2.7.0": From ac9af3dc97a4c36f26e4d72cd43099d19e328b3e Mon Sep 17 00:00:00 2001 From: toge Date: Sun, 5 Nov 2023 00:09:18 +0900 Subject: [PATCH 08/20] (#20926) aws-c-sdkutils: update aws-c-common/0.9.6 --- recipes/aws-c-sdkutils/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/aws-c-sdkutils/all/conanfile.py b/recipes/aws-c-sdkutils/all/conanfile.py index 2312d025b2cb00..e2bfcefef68781 100644 --- a/recipes/aws-c-sdkutils/all/conanfile.py +++ b/recipes/aws-c-sdkutils/all/conanfile.py @@ -43,7 +43,7 @@ def requirements(self): if Version(self.version) <= "0.1.3": self.requires("aws-c-common/0.8.2", transitive_headers=True, transitive_libs=True) else: - self.requires("aws-c-common/0.9.0", transitive_headers=True, transitive_libs=True) + self.requires("aws-c-common/0.9.6", transitive_headers=True, transitive_libs=True) def source(self): get(self, **self.conan_data["sources"][self.version], strip_root=True) From 87acb8f2a6c34ea9b111d6e783b9edd3a73839cb Mon Sep 17 00:00:00 2001 From: toge Date: Sun, 5 Nov 2023 00:37:57 +0900 Subject: [PATCH 09/20] (#20928) cs_libguarded: add version 1.4.1 --- recipes/cs_libguarded/all/conandata.yml | 3 +++ recipes/cs_libguarded/config.yml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/recipes/cs_libguarded/all/conandata.yml b/recipes/cs_libguarded/all/conandata.yml index 6464993e20067b..da0b7dc2228882 100644 --- a/recipes/cs_libguarded/all/conandata.yml +++ b/recipes/cs_libguarded/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "1.4.1": + url: "https://github.com/copperspice/cs_libguarded/archive/libguarded-1.4.1.tar.gz" + sha256: "e91235d4f5e5edb4a479fccfcd1bdc2a411dd3e3344f5c973ce5870edbab13b0" "1.4.0": url: "https://github.com/copperspice/cs_libguarded/archive/libguarded-1.4.0.tar.gz" sha256: "3911c56db6e7b222e2ec4c45513021f819ce647e7e6e803ca64dc720e8645d8e" diff --git a/recipes/cs_libguarded/config.yml b/recipes/cs_libguarded/config.yml index 942362a3d6c938..e039584f8837c7 100644 --- a/recipes/cs_libguarded/config.yml +++ b/recipes/cs_libguarded/config.yml @@ -1,4 +1,6 @@ versions: + "1.4.1": + folder: all "1.4.0": folder: all "1.3.0": From 46cf16f57bcbd78b19f665b71888cfefd492d75e Mon Sep 17 00:00:00 2001 From: toge Date: Sun, 5 Nov 2023 02:39:11 +0900 Subject: [PATCH 10/20] (#20927) aws-c-compression: update aws-c-common/0.9.6 --- recipes/aws-c-compression/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/aws-c-compression/all/conanfile.py b/recipes/aws-c-compression/all/conanfile.py index 2c6e25346108a2..a6b8eb1260a1b3 100644 --- a/recipes/aws-c-compression/all/conanfile.py +++ b/recipes/aws-c-compression/all/conanfile.py @@ -43,7 +43,7 @@ def requirements(self): if Version(self.version) <= "0.2.15": self.requires("aws-c-common/0.8.2", transitive_headers=True, transitive_libs=True) else: - self.requires("aws-c-common/0.9.0", transitive_headers=True, transitive_libs=True) + self.requires("aws-c-common/0.9.6", transitive_headers=True, transitive_libs=True) def source(self): get(self, **self.conan_data["sources"][self.version], strip_root=True) From 505fd6af1342ca3c314aad831a3e2ca546d48f73 Mon Sep 17 00:00:00 2001 From: toge Date: Sun, 5 Nov 2023 15:17:17 +0900 Subject: [PATCH 11/20] (#20939) zpp_bits: add version 4.4.20 --- recipes/zpp_bits/all/conandata.yml | 3 +++ recipes/zpp_bits/config.yml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/recipes/zpp_bits/all/conandata.yml b/recipes/zpp_bits/all/conandata.yml index 199c85b5f2f5a2..21dad3174e487e 100644 --- a/recipes/zpp_bits/all/conandata.yml +++ b/recipes/zpp_bits/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "4.4.20": + url: "https://github.com/eyalz800/zpp_bits/archive/v4.4.20.tar.gz" + sha256: "13023d3752392d64f89113bf8099a2a50b2602a7e26a2fdf78a27e327104819c" "4.4.19": url: "https://github.com/eyalz800/zpp_bits/archive/v4.4.19.tar.gz" sha256: "1d8f92e616d61cd54cb2582280cc5a28e4457d8d9cfc331137859f8ef29ff637" diff --git a/recipes/zpp_bits/config.yml b/recipes/zpp_bits/config.yml index e2021292dbcd6b..4b6dc9c6883505 100644 --- a/recipes/zpp_bits/config.yml +++ b/recipes/zpp_bits/config.yml @@ -1,4 +1,6 @@ versions: + "4.4.20": + folder: all "4.4.19": folder: all "4.4.18": From 184eaa6ae878a50693b7892327c7a86f5c44d832 Mon Sep 17 00:00:00 2001 From: toge Date: Sun, 5 Nov 2023 18:07:59 +0900 Subject: [PATCH 12/20] (#20940) rapidfuzz: add version 2.2.3 --- recipes/rapidfuzz/all/conandata.yml | 3 +++ recipes/rapidfuzz/config.yml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/recipes/rapidfuzz/all/conandata.yml b/recipes/rapidfuzz/all/conandata.yml index 230d7ae3d655f3..f9ef7412f82746 100644 --- a/recipes/rapidfuzz/all/conandata.yml +++ b/recipes/rapidfuzz/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "2.2.3": + url: "https://github.com/maxbachmann/rapidfuzz-cpp/archive/refs/tags/v2.2.3.tar.gz" + sha256: "df4412e9593945782de2212095bd4b70a8f8e63ae8f313976c616809be124d2c" "2.2.0": url: "https://github.com/maxbachmann/rapidfuzz-cpp/archive/refs/tags/v2.2.0.tar.gz" sha256: "8fe2d2792ee8b32598f4aa3aad5db7d449fb3c4a32387080f650335cf4faef81" diff --git a/recipes/rapidfuzz/config.yml b/recipes/rapidfuzz/config.yml index df6a57f68df4d4..71b60f681064b0 100644 --- a/recipes/rapidfuzz/config.yml +++ b/recipes/rapidfuzz/config.yml @@ -1,4 +1,6 @@ versions: + "2.2.3": + folder: "all" "2.2.0": folder: "all" "2.1.1": From 6a0354502df1c010acc31d346eb4c22188b37d08 Mon Sep 17 00:00:00 2001 From: toge Date: Sun, 5 Nov 2023 21:31:17 +0900 Subject: [PATCH 13/20] (#20941) hwdata: add version 0.376 --- recipes/hwdata/all/conandata.yml | 3 +++ recipes/hwdata/config.yml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/recipes/hwdata/all/conandata.yml b/recipes/hwdata/all/conandata.yml index 390b1de15a68b1..8654aa367ec46c 100644 --- a/recipes/hwdata/all/conandata.yml +++ b/recipes/hwdata/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "0.376": + url: "https://github.com/vcrhonek/hwdata/archive/v0.376.tar.gz" + sha256: "48d85dbf05650b2c382ffaadeb601cac1650f5a34ee5c452df8021af988ea090" "0.374": url: "https://github.com/vcrhonek/hwdata/archive/v0.374.tar.gz" sha256: "2a0988bf5e97e49159d7f02a5e02a719c8976d4ec883a8abb635149d221ceca0" diff --git a/recipes/hwdata/config.yml b/recipes/hwdata/config.yml index aafa69e2228824..daf8b29da7ddeb 100644 --- a/recipes/hwdata/config.yml +++ b/recipes/hwdata/config.yml @@ -1,3 +1,5 @@ versions: + "0.376": + folder: all "0.374": folder: all From ed99ffabc9062e369e466d116596e9251a651b77 Mon Sep 17 00:00:00 2001 From: toge Date: Mon, 6 Nov 2023 02:40:14 +0900 Subject: [PATCH 14/20] (#20946) paho-mqtt-c: add version 1.3.13 --- recipes/paho-mqtt-c/all/conandata.yml | 3 +++ recipes/paho-mqtt-c/config.yml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/recipes/paho-mqtt-c/all/conandata.yml b/recipes/paho-mqtt-c/all/conandata.yml index 97257e57f3eab0..fb14bce735ef18 100644 --- a/recipes/paho-mqtt-c/all/conandata.yml +++ b/recipes/paho-mqtt-c/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "1.3.13": + url: "https://github.com/eclipse/paho.mqtt.c/archive/v1.3.13.tar.gz" + sha256: "47c77e95609812da82feee30db435c3b7c720d4fd3147d466ead126e657b6d9c" "1.3.12": url: "https://github.com/eclipse/paho.mqtt.c/archive/v1.3.12.tar.gz" sha256: "6a70a664ed3bbcc1eafdc45a5dc11f3ad70c9bac12a54c2f8cef15c0e7d0a93b" diff --git a/recipes/paho-mqtt-c/config.yml b/recipes/paho-mqtt-c/config.yml index 7d5e8aea45866a..5fed002dda09d1 100644 --- a/recipes/paho-mqtt-c/config.yml +++ b/recipes/paho-mqtt-c/config.yml @@ -1,4 +1,6 @@ versions: + "1.3.13": + folder: "all" "1.3.12": folder: "all" "1.3.11": From 7de23b8d0ab3bf13727f51406ceccf9e292c69e0 Mon Sep 17 00:00:00 2001 From: SpaceIm <30052553+SpaceIm@users.noreply.github.com> Date: Mon, 6 Nov 2023 10:21:24 +0100 Subject: [PATCH 15/20] (#20714) assimp: fix cmake configuration when zlib is not a direct dependency but minizip is --- .../patches/0001-unvendor-deps-5.0.x.patch | 22 +++++++++++++++---- .../patches/0003-unvendor-deps-5.1.x.patch | 18 +++++++++++---- .../patches/0004-unvendor-deps-5.1.6.patch | 18 +++++++++++---- .../patches/0006-unvendor-deps-5.2.x.patch | 18 +++++++++++---- 4 files changed, 60 insertions(+), 16 deletions(-) diff --git a/recipes/assimp/5.x/patches/0001-unvendor-deps-5.0.x.patch b/recipes/assimp/5.x/patches/0001-unvendor-deps-5.0.x.patch index 1445d96a11b7ce..2797e985418437 100644 --- a/recipes/assimp/5.x/patches/0001-unvendor-deps-5.0.x.patch +++ b/recipes/assimp/5.x/patches/0001-unvendor-deps-5.0.x.patch @@ -1,6 +1,6 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -437,7 +437,12 @@ IF(HUNTER_ENABLED) +@@ -437,10 +437,14 @@ IF(HUNTER_ENABLED) set(ASSIMP_BUILD_MINIZIP TRUE) ELSE(HUNTER_ENABLED) IF ( NOT ASSIMP_BUILD_ZLIB ) @@ -10,11 +10,25 @@ + ASSIMP_BUILD_X_IMPORTER OR ASSIMP_BUILD_XGL_IMPORTER) + find_package(ZLIB REQUIRED) + endif() -+ set(ZLIB_FOUND TRUE) ENDIF( NOT ASSIMP_BUILD_ZLIB ) - IF( NOT ZLIB_FOUND ) -@@ -470,14 +475,14 @@ ENDIF(HUNTER_ENABLED) +- IF( NOT ZLIB_FOUND ) ++ IF(0) + MESSAGE(STATUS "compiling zlib from sources") + INCLUDE(CheckIncludeFile) + INCLUDE(CheckTypeSize) +@@ -461,23 +465,23 @@ ELSE(HUNTER_ENABLED) + SET(ZLIB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/contrib/zlib ${CMAKE_CURRENT_BINARY_DIR}/contrib/zlib) + # need to ensure we don't link with system zlib or minizip as well. + SET(ASSIMP_BUILD_MINIZIP 1) +- ELSE(NOT ZLIB_FOUND) ++ ELSE() + ADD_DEFINITIONS(-DASSIMP_BUILD_NO_OWN_ZLIB) + SET(ZLIB_LIBRARIES_LINKED -lz) +- ENDIF(NOT ZLIB_FOUND) ++ ENDIF() + INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR}) + ENDIF(HUNTER_ENABLED) IF( NOT IOS ) IF( NOT ASSIMP_BUILD_MINIZIP ) diff --git a/recipes/assimp/5.x/patches/0003-unvendor-deps-5.1.x.patch b/recipes/assimp/5.x/patches/0003-unvendor-deps-5.1.x.patch index fdd67862ddb24b..27151094d0e71c 100644 --- a/recipes/assimp/5.x/patches/0003-unvendor-deps-5.1.x.patch +++ b/recipes/assimp/5.x/patches/0003-unvendor-deps-5.1.x.patch @@ -1,6 +1,13 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -465,7 +465,12 @@ ELSE() +@@ -459,16 +459,20 @@ IF(ASSIMP_HUNTER_ENABLED) + set(ASSIMP_BUILD_MINIZIP TRUE) + ELSE() + # If the zlib is already found outside, add an export in case assimpTargets can't find it. +- IF( ZLIB_FOUND ) ++ IF(0) + INSTALL( TARGETS zlib zlibstatic + EXPORT "${TARGETS_EXPORT_NAME}") ENDIF() IF ( NOT ASSIMP_BUILD_ZLIB ) @@ -10,11 +17,14 @@ + ASSIMP_BUILD_X_IMPORTER OR ASSIMP_BUILD_XGL_IMPORTER) + find_package(ZLIB REQUIRED) + endif() -+ set(ZLIB_FOUND TRUE) ENDIF() - IF( NOT ZLIB_FOUND ) -@@ -498,12 +503,14 @@ ENDIF() +- IF( NOT ZLIB_FOUND ) ++ IF(0) + MESSAGE(STATUS "compiling zlib from sources") + INCLUDE(CheckIncludeFile) + INCLUDE(CheckTypeSize) +@@ -498,12 +502,14 @@ ENDIF() IF( NOT IOS ) IF( NOT ASSIMP_BUILD_MINIZIP ) diff --git a/recipes/assimp/5.x/patches/0004-unvendor-deps-5.1.6.patch b/recipes/assimp/5.x/patches/0004-unvendor-deps-5.1.6.patch index 67d2f67fd3661e..dedc3847ab7ea0 100644 --- a/recipes/assimp/5.x/patches/0004-unvendor-deps-5.1.6.patch +++ b/recipes/assimp/5.x/patches/0004-unvendor-deps-5.1.6.patch @@ -1,6 +1,13 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -466,7 +466,12 @@ ELSE() +@@ -460,16 +460,20 @@ IF(ASSIMP_HUNTER_ENABLED) + set(ASSIMP_BUILD_MINIZIP TRUE) + ELSE() + # If the zlib is already found outside, add an export in case assimpTargets can't find it. +- IF( ZLIB_FOUND ) ++ IF(0) + INSTALL( TARGETS zlib zlibstatic + EXPORT "${TARGETS_EXPORT_NAME}") ENDIF() IF ( NOT ASSIMP_BUILD_ZLIB ) @@ -10,11 +17,14 @@ + ASSIMP_BUILD_X_IMPORTER OR ASSIMP_BUILD_XGL_IMPORTER) + find_package(ZLIB REQUIRED) + endif() -+ set(ZLIB_FOUND TRUE) ENDIF() - IF( NOT ZLIB_FOUND ) -@@ -499,12 +504,14 @@ ENDIF() +- IF( NOT ZLIB_FOUND ) ++ IF(0) + MESSAGE(STATUS "compiling zlib from sources") + INCLUDE(CheckIncludeFile) + INCLUDE(CheckTypeSize) +@@ -499,12 +503,14 @@ ENDIF() IF( NOT IOS ) IF( NOT ASSIMP_BUILD_MINIZIP ) diff --git a/recipes/assimp/5.x/patches/0006-unvendor-deps-5.2.x.patch b/recipes/assimp/5.x/patches/0006-unvendor-deps-5.2.x.patch index 2a1e7bc39e6208..9642d329d9a0a5 100644 --- a/recipes/assimp/5.x/patches/0006-unvendor-deps-5.2.x.patch +++ b/recipes/assimp/5.x/patches/0006-unvendor-deps-5.2.x.patch @@ -1,6 +1,13 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -488,7 +488,12 @@ ELSE() +@@ -482,16 +482,20 @@ IF(ASSIMP_HUNTER_ENABLED) + set(ASSIMP_BUILD_MINIZIP TRUE) + ELSE() + # If the zlib is already found outside, add an export in case assimpTargets can't find it. +- IF( ZLIB_FOUND ) ++ IF(0) + INSTALL( TARGETS zlib zlibstatic + EXPORT "${TARGETS_EXPORT_NAME}") ENDIF() IF ( NOT ASSIMP_BUILD_ZLIB ) @@ -10,11 +17,14 @@ + ASSIMP_BUILD_X_IMPORTER OR ASSIMP_BUILD_XGL_IMPORTER) + find_package(ZLIB REQUIRED) + endif() -+ set(ZLIB_FOUND TRUE) ENDIF() - IF( NOT ZLIB_FOUND ) -@@ -521,12 +526,14 @@ ENDIF() +- IF( NOT ZLIB_FOUND ) ++ IF(0) + MESSAGE(STATUS "compiling zlib from sources") + INCLUDE(CheckIncludeFile) + INCLUDE(CheckTypeSize) +@@ -521,12 +525,14 @@ ENDIF() IF( NOT IOS ) IF( NOT ASSIMP_BUILD_MINIZIP ) From ccbb81a643ff6624764ed499e95f531e76527445 Mon Sep 17 00:00:00 2001 From: toge Date: Mon, 6 Nov 2023 18:30:54 +0900 Subject: [PATCH 16/20] (#20869) parg: add version 1.0.3 * parg: add version 1.0.3 * copy LICENSE file, update license * build_require cmake --- recipes/parg/all/conandata.yml | 3 +++ recipes/parg/all/conanfile.py | 15 +++++++++++++-- recipes/parg/config.yml | 2 ++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/recipes/parg/all/conandata.yml b/recipes/parg/all/conandata.yml index 799c3f613ca57c..72c50c78f7433d 100644 --- a/recipes/parg/all/conandata.yml +++ b/recipes/parg/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "1.0.3": + url: "https://github.com/jibsen/parg/archive/refs/tags/v1.0.3.tar.gz" + sha256: "cd54a94b4138735f6c9fbdf426a9caa8ffd5bc90988eb02f493bc86de61ce5ad" "1.0.2": url: "https://github.com/jibsen/parg/archive/refs/tags/v1.0.2.tar.gz" sha256: "3c728affd1442c5778cf548d53339132ce033c92fd61f7522d1e59fe6b1b36a8" diff --git a/recipes/parg/all/conanfile.py b/recipes/parg/all/conanfile.py index 4947f721cb4dec..ef4d18c549aef2 100644 --- a/recipes/parg/all/conanfile.py +++ b/recipes/parg/all/conanfile.py @@ -4,6 +4,7 @@ from conan.tools.apple import fix_apple_shared_install_name from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout from conan.tools.files import copy, get +from conan.tools.scm import Version required_conan_version = ">=1.53.0" @@ -11,7 +12,7 @@ class PargConan(ConanFile): name = "parg" description = "Parser for argv that works similarly to getopt" - license = "CC0-1.0" + license = ("CC0-1.0", "MIT-0") url = "https://github.com/conan-io/conan-center-index" homepage = "https://github.com/jibsen/parg" topics = ("getopt", "c") @@ -33,6 +34,10 @@ def export_sources(self): def config_options(self): if self.settings.os == "Windows": del self.options.fPIC + if Version(self.version) < "1.0.3": + self.licenses = "CC0-1.0" + else: + self.licenses = "MIT-0" def configure(self): if self.options.shared: @@ -43,6 +48,9 @@ def configure(self): def layout(self): cmake_layout(self, src_folder="src") + def build_requirements(self): + self.tool_requires("cmake/[>=3.16 <4]") + def source(self): get(self, **self.conan_data["sources"][self.version], strip_root=True) @@ -59,7 +67,10 @@ def build(self): cmake.build() def package(self): - copy(self, "COPYING", dst=os.path.join(self.package_folder, "licenses"), src=self.source_folder) + if Version(self.version) < "1.0.3": + copy(self, "COPYING", dst=os.path.join(self.package_folder, "licenses"), src=self.source_folder) + else: + copy(self, "LICENSE", dst=os.path.join(self.package_folder, "licenses"), src=self.source_folder) cmake = CMake(self) cmake.install() fix_apple_shared_install_name(self) diff --git a/recipes/parg/config.yml b/recipes/parg/config.yml index 732f7eb9a62dd4..6503626e2502c6 100644 --- a/recipes/parg/config.yml +++ b/recipes/parg/config.yml @@ -1,3 +1,5 @@ versions: + "1.0.3": + folder: "all" "1.0.2": folder: "all" From 9c0014be7d8c182594bcd546996219aafdac2fc1 Mon Sep 17 00:00:00 2001 From: toge Date: Mon, 6 Nov 2023 18:48:05 +0900 Subject: [PATCH 17/20] (#20925) aws-c-cal: update aws-c-common/0.9.6 --- recipes/aws-c-cal/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/aws-c-cal/all/conanfile.py b/recipes/aws-c-cal/all/conanfile.py index e6dc85b56045fb..5f4acadf108f8d 100644 --- a/recipes/aws-c-cal/all/conanfile.py +++ b/recipes/aws-c-cal/all/conanfile.py @@ -56,7 +56,7 @@ def requirements(self): elif Version(self.version) <= "0.5.20": self.requires("aws-c-common/0.8.2", transitive_headers=True, transitive_libs=True) else: - self.requires("aws-c-common/0.9.0", transitive_headers=True, transitive_libs=True) + self.requires("aws-c-common/0.9.6", transitive_headers=True, transitive_libs=True) if self._needs_openssl: self.requires("openssl/[>=1.1 <4]") From 3d75ae62c124cc67dcccd03bff86d54e763224ec Mon Sep 17 00:00:00 2001 From: toge Date: Mon, 6 Nov 2023 19:21:07 +0900 Subject: [PATCH 18/20] (#20949) quill: add version 3.4.0 --- recipes/quill/all/conandata.yml | 3 +++ recipes/quill/config.yml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/recipes/quill/all/conandata.yml b/recipes/quill/all/conandata.yml index bb2b9571b97fbe..7582dc1978f3cc 100644 --- a/recipes/quill/all/conandata.yml +++ b/recipes/quill/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "3.4.0": + url: "https://github.com/odygrd/quill/archive/v3.4.0.tar.gz" + sha256: "16a6cfadc288953f07d128bb51e8ebd4ca6bb8ce4175b5a8af53ce7dde324d8d" "3.3.1": url: "https://github.com/odygrd/quill/archive/v3.3.1.tar.gz" sha256: "f929d54a115b45c32dd2acd1a9810336d35c31fde9f5581c51ad2b80f980d0d1" diff --git a/recipes/quill/config.yml b/recipes/quill/config.yml index 6c3cb17b456370..5b6996c9d6283f 100644 --- a/recipes/quill/config.yml +++ b/recipes/quill/config.yml @@ -1,4 +1,6 @@ versions: + "3.4.0": + folder: "all" "3.3.1": folder: "all" "3.2.0": From 8df0633c6f3da8597ea39e7610963c820d3df7c1 Mon Sep 17 00:00:00 2001 From: toge Date: Mon, 6 Nov 2023 19:50:39 +0900 Subject: [PATCH 19/20] (#20945) aws-lambda-cpp: add version 0.2.9 --- recipes/aws-lambda-cpp/all/conandata.yml | 3 +++ recipes/aws-lambda-cpp/all/conanfile.py | 9 +++++++-- recipes/aws-lambda-cpp/config.yml | 2 ++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/recipes/aws-lambda-cpp/all/conandata.yml b/recipes/aws-lambda-cpp/all/conandata.yml index f529b57fdbe17f..ecbfb0f0cbde4e 100644 --- a/recipes/aws-lambda-cpp/all/conandata.yml +++ b/recipes/aws-lambda-cpp/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "0.2.9": + url: "https://github.com/awslabs/aws-lambda-cpp/archive/refs/tags/0.2.9.tar.gz" + sha256: "4fb98483248adf0a2b251cb1b06df8b19bbd40e7f015dccfc32b7eaae6a294e7" "0.2.8": url: "https://github.com/awslabs/aws-lambda-cpp/archive/refs/tags/v0.2.8.tar.gz" sha256: "a236516331804a0a6e2ef2273042a583e55a135bb6478308829c51e7c425acdb" diff --git a/recipes/aws-lambda-cpp/all/conanfile.py b/recipes/aws-lambda-cpp/all/conanfile.py index 19e2924677ca7f..0b0de62c879d34 100644 --- a/recipes/aws-lambda-cpp/all/conanfile.py +++ b/recipes/aws-lambda-cpp/all/conanfile.py @@ -3,6 +3,7 @@ from conan.tools.files import get, copy, rmdir from conan.tools.build import check_min_cppstd from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout +from conan.tools.scm import Version import os @@ -20,20 +21,23 @@ class AwsLambdaRuntimeConan(ConanFile): options = { "shared": [True, False], "fPIC": [True, False], + "with_backtrace": [True, False], } default_options = { "shared": False, "fPIC": True, + "with_backtrace": False, } @property def _min_cppstd(self): return 11 - def config_options(self): if self.settings.os == "Windows": del self.options.fPIC + if Version(self.version) < "0.2.9": + del self.options.with_backtrace def configure(self): if self.options.shared: @@ -44,7 +48,8 @@ def layout(self): def requirements(self): self.requires("libcurl/[>=7.78.0 <9]") - self.requires("libbacktrace/cci.20210118") + if self.options.get_safe("with_backtrace", True): + self.requires("libbacktrace/cci.20210118") def validate(self): if self.settings.compiler.get_safe("cppstd"): diff --git a/recipes/aws-lambda-cpp/config.yml b/recipes/aws-lambda-cpp/config.yml index e9c77150b83c90..4a43b4a490f8c4 100644 --- a/recipes/aws-lambda-cpp/config.yml +++ b/recipes/aws-lambda-cpp/config.yml @@ -1,3 +1,5 @@ versions: + "0.2.9": + folder: all "0.2.8": folder: all From 7f54eb51a03562f3a62595c329ff81493d876ce9 Mon Sep 17 00:00:00 2001 From: Ahajha <44127594+Ahajha@users.noreply.github.com> Date: Mon, 6 Nov 2023 06:10:46 -0500 Subject: [PATCH 20/20] (#20947) Add pybind11 2.11.1 --- recipes/pybind11/all/conandata.yml | 3 +++ recipes/pybind11/all/conanfile.py | 4 +++- recipes/pybind11/all/test_package/conanfile.py | 2 +- recipes/pybind11/config.yml | 2 ++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/recipes/pybind11/all/conandata.yml b/recipes/pybind11/all/conandata.yml index 062301bf4716d3..62adb5a253c62e 100644 --- a/recipes/pybind11/all/conandata.yml +++ b/recipes/pybind11/all/conandata.yml @@ -20,3 +20,6 @@ sources: 2.10.4: url: "https://github.com/pybind/pybind11/archive/v2.10.4.tar.gz" sha256: "832e2f309c57da9c1e6d4542dedd34b24e4192ecb4d62f6f4866a737454c9970" + 2.11.1: + url: "https://github.com/pybind/pybind11/archive/v2.11.1.tar.gz" + sha256: "d475978da0cdc2d43b73f30910786759d593a9d8ee05b1b6846d1eb16c6d2e0c" diff --git a/recipes/pybind11/all/conanfile.py b/recipes/pybind11/all/conanfile.py index 4ca688fce0b2be..aa098ee90ec20f 100644 --- a/recipes/pybind11/all/conanfile.py +++ b/recipes/pybind11/all/conanfile.py @@ -2,6 +2,7 @@ from conan.tools.cmake import CMake, CMakeToolchain from conan.tools.layout import basic_layout from conan.tools.files import get, copy, replace_in_file, rm, rmdir +from conan.tools.scm import Version import os @@ -45,8 +46,9 @@ def package(self): rmdir(self, os.path.join(self.package_folder, "share")) + checked_target = "lto" if self.version < Version("2.11.0") else "pybind11" replace_in_file(self, os.path.join(self.package_folder, "lib", "cmake", "pybind11", "pybind11Common.cmake"), - "if(TARGET pybind11::lto)", + f"if(TARGET pybind11::{checked_target})", "if(FALSE)") replace_in_file(self, os.path.join(self.package_folder, "lib", "cmake", "pybind11", "pybind11Common.cmake"), "add_library(", diff --git a/recipes/pybind11/all/test_package/conanfile.py b/recipes/pybind11/all/test_package/conanfile.py index 0f281e118c5443..1022e21500a404 100644 --- a/recipes/pybind11/all/test_package/conanfile.py +++ b/recipes/pybind11/all/test_package/conanfile.py @@ -50,4 +50,4 @@ def _python_interpreter(self): def test(self): if can_run(self): module_path = os.path.join(self.source_folder, "test.py") - self.run(f"{self._python_interpreter} {module_path}", env="conanrun") + self.run(f"{self._python_interpreter} \"{module_path}\"", env="conanrun") diff --git a/recipes/pybind11/config.yml b/recipes/pybind11/config.yml index 03a8eff62e5b8f..0637bb6f5067ed 100644 --- a/recipes/pybind11/config.yml +++ b/recipes/pybind11/config.yml @@ -13,3 +13,5 @@ versions: folder: all "2.10.4": folder: all + "2.11.1": + folder: all