Merge branch 'conan-io:master' into libpq-conan-ioGH-25282-mingw-undefined-references

Author: scandyna

.c3i/authorized_users.yml

@@ -1427,3 +1427,15 @@ authorized_users:
 - mattkretz
 - DannyLihard
 - stevenwdv
+- smessmer
+- fischjo3SICKAG
+- jrosiek
+- Thiesius
+- xakod
+- FWiesner
+- aasmune
+- sicheste
+- Alan5142
+- mefff
+- HazyMrf
+- danniesim

.c3i/conan_v2_ready_references.yml

@@ -62,6 +62,7 @@ required_for_references:
 - asyncpp
 - atomic_queue
 - audiofile
+- audiowaveform
 - autoconf
 - autoconf-archive
 - automake
@@ -412,6 +413,7 @@ required_for_references:
 - fastnoise2
 - fastpfor
 - fastprng
+- fcl
 - fernandovelcic-hexdump
 - fff
 - ffmpeg
@@ -649,6 +651,7 @@ required_for_references:
 - kissfft
 - kitten
 - kmod
+- kplot
 - krb5
 - ktx
 - kuba-zip
@@ -904,6 +907,7 @@ required_for_references:
 - llama-cpp
 - llhttp
 - llnl-units
+- llvm-core
 - llvm-openmp
 - lmdb
 - lodepng
@@ -1122,6 +1126,7 @@ required_for_references:
 - openimageio
 - openjdk
 - openjpeg
+- openjph
 - openldap
 - openmesh
 - openmpi
@@ -1140,6 +1145,7 @@ required_for_references:
 - openvino
 - openvr
 - openxlsx
+- optimlib
 - optional-lite
 - opus
 - opusfile
@@ -1253,6 +1259,7 @@ required_for_references:
 - qcbor
 - qdbm
 - qhull
+- qoi
 - qpdf
 - qpoases
 - qr-code-generator
@@ -1269,6 +1276,7 @@ required_for_references:
 - quill
 - quirc
 - qwt
+- qxlsx
 - qxmpp
 - r8brain-free-src
 - rabbitmq-c
@@ -1280,6 +1288,7 @@ required_for_references:
 - rapidcheck
 - rapidcsv
 - rapidfuzz
+- rapidhash
 - rapidjson
 - rapidxml
 - rapidyaml
@@ -1491,6 +1500,7 @@ required_for_references:
 - tiny-dnn
 - tiny-regex-c
 - tiny-utf8
+- tinyad
 - tinyalsa
 - tinycbor
 - tinycolormap

.c3i/config_v1.yml

@@ -54,6 +54,8 @@ tasks:
     detailed_status_checks: false
     update_labels: true
     build_bump_deps_pr: false
+    user_feedback:
+      description: "> [!WARNING]\n> Conan Center will stop receiving updates for Conan 1.x packages soon - please see [announcement](https://github.com/conan-io/conan-center-index/discussions/25461)."
     description_bump_deps_pr: ":vertical_traffic_light: Thank for your Bump dependencies PR. The build service will be triggered soon by a Conan team member."
     wait_for_multibranch:  # CCI jobs should wait for other multibranch job for that same PR
       job_name: "prod-v2/cci"  # e.g. "cci-v2/cci" -> this means waiting for cci-v2/cci/PR-<number>

.c3i/waitlist_users.yml

@@ -10,3 +10,5 @@ waitlist_users:
 - sabapathim
 - pixelsoba
 - liss-h
+- friedbyalice
+- nathaniel-brough

recipes/assimp/5.x/conandata.yml

@@ -1,4 +1,7 @@
 sources:
+  "5.4.3":
+    url: "https://github.com/assimp/assimp/archive/refs/tags/v5.4.3.tar.gz"
+    sha256: "66dfbaee288f2bc43172440a55d0235dfc7bf885dda6435c038e8000e79582cb"
   "5.4.2":
     url: "https://github.com/assimp/assimp/archive/refs/tags/v5.4.2.tar.gz"
     sha256: "7414861a7b038e407b510e8b8c9e58d5bf8ca76c9dfe07a01d20af388ec5086a"

recipes/assimp/5.x/conanfile.py

@@ -105,6 +105,8 @@ class AssimpConan(ConanFile):
     options.update(dict.fromkeys(_format_option_map, [True, False]))
     default_options.update(dict.fromkeys(_format_option_map, True))
 
+    short_paths = True
+
     @property
     def _min_cppstd(self):
         if Version(self.version) < "5.2.0":
@@ -238,6 +240,7 @@ def generate(self):
         tc.variables["ASSIMP_UBSAN"] = False
         tc.variables["ASSIMP_WARNINGS_AS_ERRORS"] = False
         tc.variables["USE_STATIC_CRT"] = is_msvc_static_runtime(self)
+        tc.variables["ASSIMP_BUILD_USE_CCACHE"] = False
 
         for option, (definition, _) in self._format_option_map.items():
             value = self.options.get_safe(option)

recipes/assimp/config.yml

@@ -1,4 +1,6 @@
 versions:
+  "5.4.3":
+    folder: "5.x"
   "5.4.2":
     folder: "5.x"
   "5.4.1":

recipes/au/all/conandata.yml

@@ -0,0 +1,9 @@
+sources:
+  "0.3.5":
+    url: "https://github.com/aurora-opensource/au/archive/refs/tags/0.3.5.tar.gz"
+    sha256: "7ec826dc42968dc1633de56e4f9d06e70de73e820d2ac4788e8453343a622c9b"
+patches:
+  "0.3.5":
+    - patch_file: "patches/0001-v0.3.5-disable-gtest.patch"
+      patch_description: "Remove GTest dependency and disable tests build"
+      patch_type: "conan"

recipes/au/all/conanfile.py

@@ -0,0 +1,90 @@
+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 apply_conandata_patches, copy, export_conandata_patches, get, rm, rmdir
+from conan.tools.scm import Version
+import os
+
+
+required_conan_version = ">=1.53.0"
+
+class PackageConan(ConanFile):
+    name = "au"
+    description = "A C++14-compatible physical units library"
+    license = "Apache-2.0"
+    url = "https://github.com/conan-io/conan-center-index"
+    homepage = "https://github.com/aurora-opensource/au"
+    topics = ("units", "C++14")
+    package_type = "header-library"
+    settings = "os", "arch", "compiler", "build_type"
+
+    @property
+    def _min_cppstd(self):
+        return 14
+
+    @property
+    def _compilers_minimum_version(self):
+        return {
+            "apple-clang": "10",
+            "clang": "7",
+            "gcc": "7",
+            "msvc": "191",
+            "Visual Studio": "15",
+        }
+
+    def export_sources(self):
+        export_conandata_patches(self)
+
+    def layout(self):
+        cmake_layout(self, src_folder="src")
+
+    def package_id(self):
+        self.info.clear()
+
+    def validate(self):
+        if self.settings.compiler.cppstd:
+            check_min_cppstd(self, self._min_cppstd)
+        minimum_version = self._compilers_minimum_version.get(str(self.settings.compiler), False)
+        if minimum_version and Version(self.settings.compiler.version) < minimum_version:
+            raise ConanInvalidConfiguration(
+                f"{self.ref} requires C++{self._min_cppstd}, which your compiler does not support."
+            )
+
+    def build_requirements(self):
+        self.tool_requires("cmake/[>=3.24 <4]")
+
+    def source(self):
+        get(self, **self.conan_data["sources"][self.version], strip_root=True)
+
+    def generate(self):
+        tc = CMakeToolchain(self)
+        tc.generate()
+
+    def build(self):
+        apply_conandata_patches(self)
+        cmake = CMake(self)
+        cmake.configure()
+        cmake.build()
+
+    def package(self):
+        cmake = CMake(self)
+        cmake.install()
+
+        copy(self, "LICENSE.txt", self.source_folder, os.path.join(self.package_folder, "licenses"))
+        rmdir(self, os.path.join(self.package_folder, "lib", "cmake"))
+
+    def package_info(self):
+        self.cpp_info.set_property("cmake_file_name", "Au")
+        self.cpp_info.set_property("cmake_target_name", "Au::au")
+
+        if self.settings.os in ["Linux", "FreeBSD"]:
+            self.cpp_info.system_libs.append("m")
+            self.cpp_info.system_libs.append("pthread")
+            self.cpp_info.system_libs.append("dl")
+
+        # TODO: to remove in conan v2 once cmake_find_package_* generators removed
+        self.cpp_info.filenames["cmake_find_package"] = "Au"
+        self.cpp_info.filenames["cmake_find_package_multi"] = "Au"
+        self.cpp_info.names["cmake_find_package"] = "Au::au"
+        self.cpp_info.names["cmake_find_package_multi"] = "Au::au"

recipes/au/all/patches/0001-v0.3.5-disable-gtest.patch

@@ -0,0 +1,58 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b18407f..dbd35af 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -37,23 +37,23 @@ set(AU_EXPORT_SET_NAME AuHeaders)
+ 
+ enable_testing()
+ 
+-# Bring in GoogleTest so we can build and run the tests.
+-include(FetchContent)
+-FetchContent_Declare(
+-   googletest
+-   GIT_REPOSITORY https://github.com/google/googletest.git
+-   GIT_TAG 58d77fa8070e8cec2dc1ed015d66b454c8d78850 # Release 1.12.1
+-   FIND_PACKAGE_ARGS
+-      1.12.1
+-      NAMES GTest
+-)
+-
+-# https://google.github.io/googletest/quickstart-cmake.html
+-# For Windows: Prevent overriding the parent project's compiler/linker settings
+-set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+-
+-FetchContent_MakeAvailable(googletest)
+-include(GoogleTest)
++## Bring in GoogleTest so we can build and run the tests.
++#include(FetchContent)
++#FetchContent_Declare(
++#   googletest
++#   GIT_REPOSITORY https://github.com/google/googletest.git
++#   GIT_TAG 58d77fa8070e8cec2dc1ed015d66b454c8d78850 # Release 1.12.1
++#   FIND_PACKAGE_ARGS
++#      1.12.1
++#      NAMES GTest
++#)
++#
++## https://google.github.io/googletest/quickstart-cmake.html
++## For Windows: Prevent overriding the parent project's compiler/linker settings
++#set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
++#
++#FetchContent_MakeAvailable(googletest)
++#include(GoogleTest)
+ 
+ add_subdirectory(au)
+ 
+diff --git a/cmake/HeaderOnlyLibrary.cmake b/cmake/HeaderOnlyLibrary.cmake
+index 28daf00..fbf0fab 100644
+--- a/cmake/HeaderOnlyLibrary.cmake
++++ b/cmake/HeaderOnlyLibrary.cmake
+@@ -75,7 +75,7 @@ function(header_only_library)
+   )
+ 
+   # Add the test, if requested.
+-  if (DEFINED ARG_GTEST_SRCS)
++  if (OFF)
+     add_executable("${ARG_NAME}_test")
+     target_sources("${ARG_NAME}_test" PRIVATE ${ARG_GTEST_SRCS})
+     target_link_libraries(

recipes/au/all/test_package/CMakeLists.txt

@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.15)
+
+project(test_package LANGUAGES CXX)
+
+find_package(Au REQUIRED CONFIG)
+
+add_executable(${PROJECT_NAME} test_package.cpp)
+target_link_libraries(${PROJECT_NAME} PRIVATE Au::au)
+target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14)

recipes/au/all/test_package/conanfile.py

@@ -0,0 +1,27 @@
+from conan import ConanFile
+from conan.tools.build import can_run
+from conan.tools.cmake import cmake_layout, CMake
+import os
+
+
+# It will become the standard on Conan 2.x
+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")

recipes/au/all/test_package/test_package.cpp

@@ -0,0 +1,15 @@
+#include <iostream>
+
+#include "au/au.hh"
+#include "au/io.hh"
+#include "au/units/meters.hh"
+
+using namespace au;
+
+int main(void) {
+    constexpr auto length = meters(100.0);
+
+    std::cout << length << " == " << length.in(kilo(meters)) <<" km" << std::endl;
+
+    return EXIT_SUCCESS;
+}

recipes/au/config.yml

@@ -0,0 +1,3 @@
+versions:
+  "0.3.5":
+    folder: all

recipes/bitserializer/all/conanfile.py

@@ -131,7 +131,7 @@ def generate(self):
             deps.generate()
 
     def _patch_sources(self):
-        if Version(self.version) >= "0.50" and self.options.with_rapidyaml:
+        if Version(self.version) >= "0.50":
             # Remove 'ryml' subdirectory from #include
             replace_in_file(
                 self, os.path.join(self.source_folder, "include", "bitserializer", "rapidyaml_archive.h"),