[spdlog] Add support for Conan v2

recipes/spdlog/all/conandata.yml

@@ -23,18 +23,4 @@ sources:
   "1.8.0":
     url: "https://github.com/gabime/spdlog/archive/v1.8.0.tar.gz"
     sha256: "1e68e9b40cf63bb022a4b18cdc1c9d88eb5d97e4fd64fa981950a9cacf57a4bf"
-  "1.7.0":
-    url: "https://github.com/gabime/spdlog/archive/v1.7.0.tar.gz"
-    sha256: "f0114a4d3c88be9e696762f37a7c379619443ce9d668546c61b21d41affe5b62"
-  "1.6.1":
-    url: "https://github.com/gabime/spdlog/archive/v1.6.1.tar.gz"
-    sha256: "378a040d91f787aec96d269b0c39189f58a6b852e4cbf9150ccfacbe85ebbbfc"
-  "1.6.0":
-    url: "https://github.com/gabime/spdlog/archive/v1.6.0.tar.gz"
-    sha256: "0421667c9f2fc78e6548d44f7bc5921be0f03e612df384294c16cedb93d967f8"
-  "1.5.0":
-    url: "https://github.com/gabime/spdlog/archive/v1.5.0.tar.gz"
-    sha256: "b38e0bbef7faac2b82fed550a0c19b0d4e7f6737d5321d4fd8f216b80f8aee8a"
-  "1.4.2":
-    url: "https://github.com/gabime/spdlog/archive/v1.4.2.tar.gz"
-    sha256: "821c85b120ad15d87ca2bc44185fa9091409777c756029125a02f81354072157"
+

recipes/spdlog/all/conanfile.py

@@ -1,18 +1,23 @@
-from conans import CMake, ConanFile, tools
-from conans.errors import ConanInvalidConfiguration
+from conan import ConanFile
+from conan.tools.cmake import CMake, CMakeToolchain, cmake_layout
+from conan.tools.files import get, copy, rmdir, replace_in_file
+from conan.tools.scm import Version
+from conan.tools.build import check_min_cppstd
+from conan.tools.microsoft import is_msvc_static_runtime
+from conan.errors import ConanInvalidConfiguration
 import os
 
-required_conan_version = ">=1.43.0"
+
+required_conan_version = ">=1.50.0"
 
 
 class SpdlogConan(ConanFile):
     name = "spdlog"
     description = "Fast C++ logging library"
     url = "https://github.com/conan-io/conan-center-index"
     homepage = "https://github.com/gabime/spdlog"
-    topics = ("spdlog", "logging", "header-only")
+    topics = ("logging", "log-filtering", "header-only")
     license = "MIT"
-
     settings = "os", "arch", "compiler", "build_type"
     options = {
         "shared": [True, False],
@@ -30,14 +35,7 @@ class SpdlogConan(ConanFile):
         "wchar_filenames": False,
         "no_exceptions": False,
     }
-
-    exports_sources = "CMakeLists.txt"
-    generators = "cmake", "cmake_find_package", "cmake_find_package_multi"
-    _cmake = None
-
-    @property
-    def _source_subfolder(self):
-        return "source_subfolder"
+    generators = "CMakeDeps"
 
     def config_options(self):
         if self.settings.os == "Windows":
@@ -51,98 +49,96 @@ def configure(self):
             del self.options.fPIC
 
     def requirements(self):
-        if tools.Version(self.version) >= "1.10.0":
+        if Version(self.version) >= "1.10.0":
             self.requires("fmt/8.1.1")
-        elif tools.Version(self.version) >= "1.9.0":
+        elif Version(self.version) >= "1.9.0":
             self.requires("fmt/8.0.1")
-        elif tools.Version(self.version) >= "1.7.0":
+        elif Version(self.version) >= "1.7.0":
             self.requires("fmt/7.1.3")
-        elif tools.Version(self.version) >= "1.5.0":
+        elif Version(self.version) >= "1.5.0":
             self.requires("fmt/6.2.1")
         else:
             self.requires("fmt/6.0.0")
 
-    def validate(self):
+    def validate_build(self):
+        if self.settings.compiler.cppstd:
+            check_min_cppstd(self, 11)
         if self.settings.os != "Windows" and (self.options.wchar_support or self.options.wchar_filenames):
             raise ConanInvalidConfiguration("wchar is only supported under windows")
-        if self.options.get_safe("shared", False):
-            if self.settings.os == "Windows" and tools.Version(self.version) < "1.6.0":
-                raise ConanInvalidConfiguration("spdlog shared lib is not yet supported under windows")
+        if self.options.get_safe("shared", False) and is_msvc_static_runtime(self):
             if self.settings.compiler == "Visual Studio" and "MT" in self.settings.compiler.runtime:
                 raise ConanInvalidConfiguration("Visual Studio build for shared library with MT runtime is not supported")
 
     def package_id(self):
-        if self.options.header_only:
-            self.info.header_only()
+        if self.info.options.header_only:
+            self.info.clear()
 
     def source(self):
-        tools.get(**self.conan_data["sources"][self.version],
-                  destination=self._source_subfolder, strip_root=True)
-
-    def _configure_cmake(self):
-        if self._cmake:
-            return self._cmake
-        self._cmake = CMake(self)
-        self._cmake.definitions["SPDLOG_BUILD_EXAMPLE"] = False
-        self._cmake.definitions["SPDLOG_BUILD_EXAMPLE_HO"] = False
-        self._cmake.definitions["SPDLOG_BUILD_TESTS"] = False
-        self._cmake.definitions["SPDLOG_BUILD_TESTS_HO"] = False
-        self._cmake.definitions["SPDLOG_BUILD_BENCH"] = False
-        self._cmake.definitions["SPDLOG_FMT_EXTERNAL"] = True
-        self._cmake.definitions["SPDLOG_FMT_EXTERNAL_HO"] = self.options["fmt"].header_only
-        self._cmake.definitions["SPDLOG_BUILD_SHARED"] = not self.options.header_only and self.options.shared
-        self._cmake.definitions["SPDLOG_WCHAR_SUPPORT"] = self.options.wchar_support
-        self._cmake.definitions["SPDLOG_WCHAR_FILENAMES"] = self.options.wchar_filenames
-        self._cmake.definitions["SPDLOG_INSTALL"] = True
-        self._cmake.definitions["SPDLOG_NO_EXCEPTIONS"] = self.options.no_exceptions
-        if self.settings.os in ("iOS", "tvOS", "watchOS"):
-            self._cmake.definitions["SPDLOG_NO_TLS"] = True
-        if tools.cross_building(self):
-            # Workaround to find CMake config files in some cross-build scenario
-            # TODO: to remove if something like https://github.com/conan-io/conan/issues/9427#issuecomment-993685376
-            # is implemented
-            self._cmake.definitions["CMAKE_FIND_ROOT_PATH_MODE_PACKAGE"] = "BOTH"
-        self._cmake.configure()
-        return self._cmake
+        get(self, **self.conan_data["sources"][self.version], strip_root=True)
+
+    def generate(self):
+        if not self.options.header_only:
+            fmt = self.dependencies["fmt"]
+            tc = CMakeToolchain(self)
+            tc.variables["SPDLOG_BUILD_EXAMPLE"] = False
+            tc.variables["SPDLOG_BUILD_EXAMPLE_HO"] = False
+            tc.variables["SPDLOG_BUILD_TESTS"] = False
+            tc.variables["SPDLOG_BUILD_TESTS_HO"] = False
+            tc.variables["SPDLOG_BUILD_BENCH"] = False
+            tc.variables["SPDLOG_FMT_EXTERNAL"] = True
+            tc.variables["SPDLOG_FMT_EXTERNAL_HO"] = fmt.options.header_only
+            tc.variables["SPDLOG_BUILD_SHARED"] = not self.options.header_only and self.options.shared
+            tc.variables["SPDLOG_WCHAR_SUPPORT"] = self.options.wchar_support
+            tc.variables["SPDLOG_WCHAR_FILENAMES"] = self.options.wchar_filenames
+            tc.variables["SPDLOG_INSTALL"] = True
+            tc.variables["SPDLOG_NO_EXCEPTIONS"] = self.options.no_exceptions
+            if self.settings.os in ("iOS", "tvOS", "watchOS"):
+                self._cmake.definitions["SPDLOG_NO_TLS"] = True
+            tc.variables["CMAKE_POLICY_DEFAULT_CMP0091"] = "NEW"
+            tc.generate()
+
+    def layout(self):
+        cmake_layout(self)
 
     def _disable_werror(self):
-        tools.replace_in_file(os.path.join(self._source_subfolder, "cmake", "utils.cmake"), "/WX", "")
+        replace_in_file(self, os.path.join(self.source_folder, "cmake", "utils.cmake"), "/WX", "")
 
     def build(self):
-        if tools.Version(self.version) < "1.7" and tools.Version(self.deps_cpp_info["fmt"].version) >= "7":
-            raise ConanInvalidConfiguration("The project {}/{} requires fmt < 7.x".format(self.name, self.version))
-
         self._disable_werror()
         if not self.options.header_only:
-            cmake = self._configure_cmake()
+            cmake = CMake(self)
+            cmake.configure()
             cmake.build()
 
     def package(self):
-        self.copy("LICENSE", dst="licenses", src=self._source_subfolder)
+        copy(self, "LICENSE", dst="licenses", src=self.source_folder)
         if self.options.header_only:
-            self.copy(pattern="*.h", dst="include", src=os.path.join(self._source_subfolder, "include"))
+            copy(self, pattern="*.h", dst="include", src=os.path.join(self.source_folder, "include"))
         else:
-            cmake = self._configure_cmake()
+            cmake = CMake(self)
             cmake.install()
-            tools.rmdir(os.path.join(self.package_folder, "lib", "cmake"))
-            tools.rmdir(os.path.join(self.package_folder, "lib", "pkgconfig"))
-            tools.rmdir(os.path.join(self.package_folder, "lib", "spdlog", "cmake"))
+            rmdir(self, os.path.join(self.package_folder, "lib", "cmake"))
+            rmdir(self, os.path.join(self.package_folder, "lib", "pkgconfig"))
+            rmdir(self, os.path.join(self.package_folder, "lib", "spdlog", "cmake"))
 
     def package_info(self):
+        # TODO: to remove in conan v2 once cmake_find_package* generators removed
+        self.cpp_info.names["cmake_find_package"] = "spdlog"
+        self.cpp_info.names["cmake_find_package_multi"] = "spdlog"
+
         target = "spdlog_header_only" if self.options.header_only else "spdlog"
         self.cpp_info.set_property("cmake_file_name", "spdlog")
-        self.cpp_info.set_property("cmake_target_name", "spdlog::{}".format(target))
+        self.cpp_info.set_property("cmake_target_name", f"spdlog::{target}")
         self.cpp_info.set_property("pkg_config_name", "spdlog")
 
-        self.cpp_info.names["cmake_find_package"] = "spdlog"
-        self.cpp_info.names["cmake_find_package_multi"] = "spdlog"
         self.cpp_info.components["libspdlog"].names["cmake_find_package"] = target
         self.cpp_info.components["libspdlog"].names["cmake_find_package_multi"] = target
 
         self.cpp_info.components["libspdlog"].defines.append("SPDLOG_FMT_EXTERNAL")
         self.cpp_info.components["libspdlog"].requires = ["fmt::fmt"]
         if not self.options.header_only:
-            self.cpp_info.components["libspdlog"].libs = tools.collect_libs(self)
+            suffix = "d" if self.settings.build_type == "Debug" else ""
+            self.cpp_info.components["libspdlog"].libs = [f"spdlog{suffix}"]
             self.cpp_info.components["libspdlog"].defines.append("SPDLOG_COMPILED_LIB")
         if self.options.wchar_support:
             self.cpp_info.components["libspdlog"].defines.append("SPDLOG_WCHAR_TO_UTF8_SUPPORT")

recipes/spdlog/all/test_package/CMakeLists.txt

@@ -1,15 +1,16 @@
-cmake_minimum_required(VERSION 3.1)
-project(test_package)
+cmake_minimum_required(VERSION 3.15)
+project(test_package CXX)
 
-include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
-conan_basic_setup(TARGETS)
+set(CMAKE_POLICY_DEFAULT_CMP0091 NEW)
 
 find_package(spdlog REQUIRED CONFIG)
+find_package(fmt REQUIRED CONFIG)
+
 
 add_executable(${PROJECT_NAME} test_package.cpp)
-if(TARGET spdlog::spdlog_header_only)
-    target_link_libraries(${PROJECT_NAME} spdlog::spdlog_header_only)
+if(SPDLOG_HEADER_ONLY)
+    target_link_libraries(${PROJECT_NAME} spdlog::spdlog_header_only fmt::fmt)
 else()
-    target_link_libraries(${PROJECT_NAME} spdlog::spdlog)
+    target_link_libraries(${PROJECT_NAME} spdlog::spdlog fmt::fmt)
 endif()
 set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 11)

recipes/spdlog/all/test_package/conanfile.py

@@ -1,18 +1,34 @@
-from conans import ConanFile, CMake, tools
 import os
+from conan import ConanFile
+from conan.tools.cmake import CMake, CMakeToolchain
+from conan.tools.build import can_run
+from conan.tools.cmake import cmake_layout
+
+
+required_conan_version = ">=1.43.0"
 
 
 class TestPackageConan(ConanFile):
-    settings = "os", "arch", "compiler", "build_type"
-    generators = "cmake", "cmake_find_package_multi"
+    settings = "os", "compiler", "build_type", "arch"
+    generators = "CMakeDeps", "CMakeToolchain"
+    test_type = "explicit"
+
+    def requirements(self):
+        self.requires(self.tested_reference_str)
+
+    def generate(self):
+        tc = CMakeToolchain(self)
+        tc.variables["SPDLOG_HEADER_ONLY"] = self.dependencies["spdlog"].options.header_only
+        tc.generate()
+
+    def layout(self):
+        cmake_layout(self)
 
     def build(self):
         cmake = CMake(self)
         cmake.configure()
         cmake.build()
 
     def test(self):
-        if not tools.cross_building(self):
-            tools.mkdir("logs/")
-            bin_path = os.path.join("bin", "test_package")
-            self.run(bin_path, run_environment=True)
+        if can_run(self):
+            self.run(os.path.join(self.cpp.build.bindirs[0], "test_package"), env="conanrun")

recipes/spdlog/all/test_v1_package/CMakeLists.txt

@@ -0,0 +1,15 @@
+cmake_minimum_required(VERSION 3.1)
+project(test_package)
+
+include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
+conan_basic_setup(TARGETS)
+
+find_package(spdlog REQUIRED CONFIG)
+
+add_executable(${PROJECT_NAME} test_package.cpp)
+if(TARGET spdlog::spdlog_header_only)
+    target_link_libraries(${PROJECT_NAME} spdlog::spdlog_header_only)
+else()
+    target_link_libraries(${PROJECT_NAME} spdlog::spdlog)
+endif()
+set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 11)

recipes/spdlog/all/test_v1_package/conanfile.py

@@ -0,0 +1,19 @@
+# pylint: skip-file
+from conans import ConanFile, CMake, tools
+import os
+
+
+class TestPackageConan(ConanFile):
+    settings = "os", "arch", "compiler", "build_type"
+    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):
+            tools.mkdir("logs/")
+            bin_path = os.path.join("bin", "test_package")
+            self.run(bin_path, run_environment=True)

recipes/spdlog/all/test_v1_package/test_package.cpp

@@ -0,0 +1,7 @@
+#include <cstdlib>
+#include "spdlog/spdlog.h"
+
+int main(void) {
+    spdlog::info("Welcome to spdlog version {}.{}.{}  !", SPDLOG_VER_MAJOR, SPDLOG_VER_MINOR, SPDLOG_VER_PATCH);
+    return EXIT_SUCCESS;
+}

recipes/spdlog/config.yml

@@ -15,13 +15,3 @@ versions:
     folder: "all"
   "1.8.0":
     folder: "all"
-  "1.7.0":
-    folder: "all"
-  "1.6.1":
-    folder: "all"
-  "1.6.0":
-    folder: "all"
-  "1.5.0":
-    folder: "all"
-  "1.4.2":
-    folder: "all"