Merge pull request conan-io#77 from devauto/merge-from-conan-io

Merge in changes from conan-io/master

.c3i/authorized_users.yml

@@ -1231,3 +1231,5 @@ authorized_users:
 - alfred-sa
 - leducp
 - mrjoel
+- Nerixyz
+- irieger

.c3i/conan_v2_ready_references.yml

@@ -207,6 +207,7 @@ required_for_references:
 - crc32c
 - create-dmg
 - croncpp
+- crowcpp-crow
 - crunch
 - cryptopp
 - cs_libguarded
@@ -710,6 +711,7 @@ required_for_references:
 - mariadb-connector-c
 - marisa
 - matchit
+- mathfu
 - mathter
 - matio
 - mattiasgustavsson-libs
@@ -826,6 +828,7 @@ required_for_references:
 - onnx
 - onnxruntime
 - open-dis-cpp
+- open62541
 - openal
 - openal-soft
 - openapi-generator
@@ -894,7 +897,9 @@ required_for_references:
 - pipes
 - pixman
 - pkgconf
+- platform.converters
 - platform.delegates
+- platform.equality
 - platform.exceptions
 - platform.hashing
 - platform.interfaces
@@ -975,6 +980,7 @@ required_for_references:
 - reckless
 - rectanglebinpack
 - rectpack2d
+- redboltz-mqtt_cpp
 - redis-plus-plus
 - refl-cpp
 - replxx
@@ -1051,6 +1057,7 @@ required_for_references:
 - soxr
 - span-lite
 - spdlog
+- spectra
 - spirv-cross
 - spirv-headers
 - spirv-tools
@@ -1089,6 +1096,7 @@ required_for_references:
 - taocpp-operators
 - taocpp-pegtl
 - taocpp-sequences
+- taocpp-taopq
 - taocpp-tuple
 - taskflow
 - taywee-args
@@ -1126,6 +1134,7 @@ required_for_references:
 - tinyspline
 - tinyxml
 - tinyxml2
+- tk
 - tl
 - tl-expected
 - tl-function-ref
@@ -1160,6 +1169,7 @@ required_for_references:
 - uncrustify
 - uni-algo
 - unicorn
+- units
 - unity
 - univalue
 - unordered_dense
@@ -1169,21 +1179,29 @@ required_for_references:
 - uriparser
 - usockets
 - usrsctp
+- utf8.h
 - utf8proc
 - utfcpp
 - util-linux-libuuid
 - uvw
 - uwebsockets
+- v-hacd
 - vaapi
+- valijson
 - variant-lite
+- vc
+- vcglib
 - vdpau
+- vectorclass
+- vectorial
 - veque
 - vincentlaucsb-csv-parser
 - vir-simd
 - visit_struct
 - vo-amrwbenc
 - volk
 - vorbis
+- voropp
 - vsg
 - vtu11
 - vulkan-headers
@@ -1205,18 +1223,22 @@ required_for_references:
 - whereami
 - whisper-cpp
 - wil
+- wildmidi
 - winflexbison
+- winmd
 - wiringpi
 - wise_enum
 - wolfssl
 - wslay
 - wt
 - wtl
+- wyhash
 - xapian-core
 - xbyak
 - xerces-c
 - xkbcommon
 - xkeyboard-config
+- xlnt
 - xlsxio
 - xmlsec
 - xnnpack
@@ -1226,7 +1248,10 @@ required_for_references:
 - xorg-macros
 - xorg-makedepend
 - xorg-proto
+- xorstr
 - xoshiro-cpp
+- xpack
+- xproperty
 - xsd
 - xsimd
 - xtensor
@@ -1240,19 +1265,25 @@ required_for_references:
 - yaml-cpp
 - yas
 - yasm
+- yder
 - yyjson
 - z3
 - zbar
 - zeromq
 - zfp
 - zimg
+- zint
 - zlib
 - zlib-ng
 - zmarok-semver
 - zmqpp
 - zookeeper-client-c
+- zopfli
 - zpp_bits
+- zpp_throwing
 - zstd
+- zstr
 - zug
 - zulu-openjdk
 - zxing-cpp
+- zziplib

docs/package_templates/header_only/all/conanfile.py

@@ -36,7 +36,7 @@ def _min_cppstd(self):
     def _compilers_minimum_version(self):
         return {
             "Visual Studio": "15",
-            "msvc": "14.1",
+            "msvc": "191",
             "gcc": "5",
             "clang": "5",
             "apple-clang": "5.1",

recipes/arrow/all/conanfile.py

@@ -336,7 +336,7 @@ def requirements(self):
             self.options.get_safe("runtime_simd_level") != None:
             self.requires("xsimd/9.0.1")
         if self.options.with_zlib:
-            self.requires("zlib/1.2.13")
+            self.requires("zlib/[>=1.2.11 <2]")
         if self.options.with_zstd:
             self.requires("zstd/1.5.2")
         if self.options.with_re2:

recipes/c-blosc/all/conanfile.py

@@ -60,7 +60,7 @@ def requirements(self):
         if self.options.with_snappy:
             self.requires("snappy/1.1.10")
         if self.options.with_zlib:
-            self.requires("zlib/1.2.13")
+            self.requires("zlib/[>=1.2.11 <2]")
         if self.options.with_zstd:
             self.requires("zstd/1.5.5")
 

recipes/ccfits/all/conanfile.py

@@ -1,21 +1,21 @@
-from conan import ConanFile
+from conan import ConanFile, conan_version
 from conan.tools.build import check_min_cppstd
 from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
 from conan.tools.files import apply_conandata_patches, copy, export_conandata_patches, get
 from conan.tools.scm import Version
 import os
 
-required_conan_version = ">=1.52.0"
+required_conan_version = ">=1.54.0"
 
 
 class CcfitsConan(ConanFile):
     name = "ccfits"
     description = "CCfits is an object oriented interface to the cfitsio library."
     license = "ISC"
-    topics = ("ccfits", "fits", "image", "nasa", "astronomy", "astrophysics", "space")
+    topics = ("fits", "image", "nasa", "astronomy", "astrophysics", "space")
     homepage = "https://heasarc.gsfc.nasa.gov/fitsio/ccfits"
     url = "https://github.com/conan-io/conan-center-index"
-
+    package_type = "library"
     settings = "os", "arch", "compiler", "build_type"
     options = {
         "shared": [True, False],
@@ -35,32 +35,35 @@ def config_options(self):
 
     def configure(self):
         if self.options.shared:
-            try:
-                del self.options.fPIC
-            except Exception:
-                pass
+            self.options.rm_safe("fPIC")
 
     def layout(self):
         cmake_layout(self, src_folder="src")
 
     def requirements(self):
-        self.requires("cfitsio/4.1.0")
+        # transitive_headers: CCfits/CCfits.h includes fitsio.h
+        self.requires("cfitsio/4.2.0", transitive_headers=True)
 
     def validate_build(self):
         if Version(self.version) >= "2.6":
             if self.settings.compiler.get_safe("cppstd"):
                 check_min_cppstd(self, 11)
+        else:
+            if conan_version >= "2":
+                # FIXME: c3i linter complains, but function is there
+                # https://docs.conan.io/2.0/reference/tools/build.html?highlight=check_min_cppstd#conan-tools-build-check-max-cppstd
+                import sys
+                check_max_cppstd = getattr(sys.modules["conan.tools.build"], "check_max_cppstd")
+                # C++17 and higher not supported in ccfits < 2.6 due to auto_ptr
+                check_max_cppstd(self, 14)
 
     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)
         # Export symbols for msvc shared
         tc.variables["CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS"] = True
-        # Honor BUILD_SHARED_LIBS from conan_toolchain (see https://github.com/conan-io/conan/issues/11840)
-        tc.cache_variables["CMAKE_POLICY_DEFAULT_CMP0077"] = "NEW"
         tc.generate()
         deps = CMakeDeps(self)
         deps.generate()

recipes/ccfits/all/test_v1_package/CMakeLists.txt

@@ -1,10 +1,8 @@
 cmake_minimum_required(VERSION 3.1)
-project(test_package LANGUAGES CXX)
+project(test_package)
 
 include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
 conan_basic_setup(TARGETS)
 
-find_package(ccfits REQUIRED CONFIG)
-
-add_executable(${PROJECT_NAME} ../test_package/test_package.cpp)
-target_link_libraries(${PROJECT_NAME} PRIVATE ccfits::ccfits)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../test_package
+                 ${CMAKE_CURRENT_BINARY_DIR}/test_package)

recipes/cfitsio/all/conanfile.py

@@ -56,7 +56,7 @@ def layout(self):
         cmake_layout(self, src_folder="src")
 
     def requirements(self):
-        self.requires("zlib/1.2.13")
+        self.requires("zlib/[>=1.2.11 <2]")
         if self.options.threadsafe and self.settings.os == "Windows" and \
            self.settings.compiler.get_safe("threads") != "posix":
             self.requires("pthreads4w/3.0.0")

recipes/cgal/all/conanfile.py

@@ -163,6 +163,10 @@ def _create_cmake_module_variables(self, module_file):
 endfunction()
 
 CGAL_setup_CGAL_flags(CGAL::CGAL)
+
+# CGAL use may rely on the presence of those two variables
+set(CGAL_USE_GMP  TRUE CACHE INTERNAL "CGAL library is configured to use GMP")
+set(CGAL_USE_MPFR TRUE CACHE INTERNAL "CGAL library is configured to use MPFR")
 ''')
         save(self, module_file, content)
 

recipes/civetweb/all/conanfile.py

@@ -87,7 +87,7 @@ def requirements(self):
             else:
                 self.requires("openssl/[>=1 <4]")
         if self.options.get_safe("with_zlib"):
-            self.requires("zlib/1.2.13")
+            self.requires("zlib/[>=1.2.11 <2]")
 
     def validate(self):
         if self.options.get_safe("ssl_dynamic_loading") and not self.dependencies["openssl"].options.shared:

recipes/cmake/binary/conandata.yml

@@ -1,4 +1,23 @@
 sources:
+  "3.27.5":
+    Linux:
+      armv8:
+        url: "https://cmake.org/files/v3.27/cmake-3.27.5-linux-aarch64.tar.gz"
+        sha256: "2ffaf176d0f93c332abaffbf3ce82fc8c90e49e0fcee8dc16338bcfbb150ead7"
+      x86_64:
+        url: "https://cmake.org/files/v3.27/cmake-3.27.5-linux-x86_64.tar.gz"
+        sha256: "138c68addae825b16ed78d792dafef5e0960194833f48bd77e7e0429c6bc081c"
+    Macos:
+      universal:
+        url: "https://cmake.org/files/v3.27/cmake-3.27.5-macos10.10-universal.tar.gz"
+        sha256: "1f776640e6ad35b2b3fe2ab5e39cff363b2c3034ecb56e45597402b7bf010e47"
+    Windows:
+      armv8:
+        url: "https://cmake.org/files/v3.27/cmake-3.27.5-windows-arm64.zip"
+        sha256: "3fcc84d34e3213b0e4261295eaddfc645685ab366dc570421555e7f3d3080d3a"
+      x86_64:
+        url: "https://cmake.org/files/v3.27/cmake-3.27.5-windows-x86_64.zip"
+        sha256: "1e8e06c8ecf63d5f213019e1cd39ea41a6cf952db5f2c8e69b8e47f5bc302684"
   "3.27.4":
     Linux:
       armv8:

recipes/cmake/combined/conandata.yml

@@ -1,4 +1,23 @@
 binaries:
+  "3.27.5":
+    Linux:
+      armv8:
+        url: "https://cmake.org/files/v3.27/cmake-3.27.5-linux-aarch64.tar.gz"
+        sha256: "2ffaf176d0f93c332abaffbf3ce82fc8c90e49e0fcee8dc16338bcfbb150ead7"
+      x86_64:
+        url: "https://cmake.org/files/v3.27/cmake-3.27.5-linux-x86_64.tar.gz"
+        sha256: "138c68addae825b16ed78d792dafef5e0960194833f48bd77e7e0429c6bc081c"
+    Macos:
+      universal:
+        url: "https://cmake.org/files/v3.27/cmake-3.27.5-macos10.10-universal.tar.gz"
+        sha256: "1f776640e6ad35b2b3fe2ab5e39cff363b2c3034ecb56e45597402b7bf010e47"
+    Windows:
+      armv8:
+        url: "https://cmake.org/files/v3.27/cmake-3.27.5-windows-arm64.zip"
+        sha256: "3fcc84d34e3213b0e4261295eaddfc645685ab366dc570421555e7f3d3080d3a"
+      x86_64:
+        url: "https://cmake.org/files/v3.27/cmake-3.27.5-windows-x86_64.zip"
+        sha256: "1e8e06c8ecf63d5f213019e1cd39ea41a6cf952db5f2c8e69b8e47f5bc302684"
   "3.27.4":
     Linux:
       armv8:
@@ -208,3 +227,6 @@ sources:
   "3.27.4":
     url: "https://github.com/Kitware/CMake/releases/download/v3.27.4/cmake-3.27.4.tar.gz"
     sha256: "0a905ca8635ca81aa152e123bdde7e54cbe764fdd9a70d62af44cad8b92967af"
+  "3.27.5":
+    url: "https://github.com/Kitware/CMake/releases/download/v3.27.5/cmake-3.27.5.tar.gz"
+    sha256: "5175e8fe1ca9b1dd09090130db7201968bcce1595971ff9e9998c2f0765004c9"

recipes/cmake/config.yml

@@ -20,4 +20,6 @@ versions:
   "3.27.1":
     folder: "combined"
   "3.27.4":
+    folder: "combined"
+  "3.27.5":
     folder: "combined"