(#10456) [fmt] conan v2 compatibility

* fmt for 2.0 (#13) * add fmt for 2.0 * safe rm * remove names * add definition * fix * names back * remove export_sources * add exports_sources * - compat Signed-off-by: SSE4 <tomskside@gmail.com> * - really copy the license Signed-off-by: SSE4 <tomskside@gmail.com> * - fix header-only Signed-off-by: SSE4 <tomskside@gmail.com> * - define includedirs on component Signed-off-by: SSE4 <tomskside@gmail.com> * - run environment Signed-off-by: SSE4 <tomskside@gmail.com> * - restore v1 test_package Signed-off-by: SSE4 <tomskside@gmail.com> * - compat Signed-off-by: SSE4 <tomskside@gmail.com> * - port changes Signed-off-by: SSE4 <tomskside@gmail.com> * - simplify imports Signed-off-by: SSE4 <tomskside@gmail.com> * Update recipes/fmt/all/conanfile.py Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Update recipes/fmt/all/conanfile.py * - use conan.tools.files.rmdir() Signed-off-by: SSE4 <tomskside@gmail.com> * - change layout import Signed-off-by: SSE4 <tomskside@gmail.com> * - use can_run Signed-off-by: SSE4 <tomskside@gmail.com> * Update recipes/fmt/all/conanfile.py * Update recipes/fmt/all/test_v1_package/conanfile.py Co-authored-by: Javier G. Sogo <jgsogo@gmail.com> * - destination is not needed Signed-off-by: SSE4 <tomskside@gmail.com> * - remove useless try/catch Signed-off-by: SSE4 <tomskside@gmail.com> * Update recipes/fmt/all/conanfile.py Co-authored-by: Luis Martinez <lasote@gmail.com> * - try package_info @czoido suggested * Revert "- try package_info @czoido suggested" This reverts commit 56c874a. * - try one more package_info by @czoido * Update recipes/fmt/all/conanfile.py * - bump required version Signed-off-by: SSE4 <tomskside@gmail.com> * - fix hook Signed-off-by: SSE4 <tomskside@gmail.com> Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> Co-authored-by: Javier G. Sogo <jgsogo@gmail.com> Co-authored-by: Luis Martinez <lasote@gmail.com>
conan-io · Jul 20, 2022 · de720f0 · de720f0
1 parent 342edb2
commit de720f0
Show file tree

Hide file tree

Showing 10 changed files with 105 additions and 109 deletions.
diff --git a/recipes/fmt/all/CMakeLists.txt b/recipes/fmt/all/CMakeLists.txt
diff --git a/recipes/fmt/all/conandata.yml b/recipes/fmt/all/conandata.yml
@@ -56,7 +56,6 @@ sources:
 patches:
   "5.3.0":
     - patch_file: "patches/fix-install-5.3.0.patch"
-      base_path: "source_subfolder"
   # "6.0.0":
   #   - patch_file: "patches/fix-install-6.0.0.patch"
   #     base_path: "source_subfolder"

diff --git a/recipes/fmt/all/conanfile.py b/recipes/fmt/all/conanfile.py
@@ -1,10 +1,13 @@
 import os
+import shutil
 
-from conan.tools.microsoft import msvc_runtime_flag
-from conans import ConanFile, CMake, tools
-from conans.errors import ConanInvalidConfiguration
+from conan import ConanFile
+from conan.tools.scm import Version
+from conan.tools.cmake import CMake, CMakeToolchain, cmake_layout
+from conan.tools.files import get, apply_conandata_patches, copy, rmdir
 
-required_conan_version = ">=1.43.0"
+
+required_conan_version = ">=1.47.0"
 
 
 class FmtConan(ConanFile):
@@ -14,6 +17,7 @@ class FmtConan(ConanFile):
     topics = ("fmt", "format", "iostream", "printf")
     url = "https://github.com/conan-io/conan-center-index"
     license = "MIT"
+    exports_sources = "patches/*"
 
     settings = "os", "arch", "compiler", "build_type"
     options = {
@@ -31,29 +35,17 @@ class FmtConan(ConanFile):
         "with_os_api": True,
     }
 
-    generators = "cmake"
-    _cmake = None
-
-    @property
-    def _source_subfolder(self):
-        return "source_subfolder"
-
-    @property
-    def _build_subfolder(self):
-        return "build_subfolder"
-
-    @property
-    def _is_msvc(self):
-        return str(self.settings.compiler) in ["Visual Studio", "msvc"]
-
     @property
     def _has_with_os_api_option(self):
-        return tools.Version(self.version) >= "7.0.0"
+        return Version(str(self.version)) >= "7.0.0"
 
-    def export_sources(self):
-        self.copy("CMakeLists.txt")
-        for patch in self.conan_data.get("patches", {}).get(self.version, []):
-            self.copy(patch["patch_file"])
+    def generate(self):
+        if not self.options.header_only:
+            tc = CMakeToolchain(self)
+            tc.generate()  
+
+    def layout(self):
+        cmake_layout(self)
 
     def config_options(self):
         if self.settings.os == "Windows":
@@ -71,65 +63,74 @@ def configure(self):
         elif self.options.shared:
             del self.options.fPIC
 
-    def validate(self):
-        if self.options.get_safe("shared") and self._is_msvc and "MT" in msvc_runtime_flag(self):
-            raise ConanInvalidConfiguration(
-                "Visual Studio build for shared library with MT runtime is not supported"
-            )
-
     def package_id(self):
-        if self.options.header_only:
+        if self.info.options.header_only:  # might be changed to self.info.clear() in 1.50
             self.info.header_only()
         else:
             del self.info.options.with_fmt_alias
 
     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["FMT_DOC"] = False
-        self._cmake.definitions["FMT_TEST"] = False
-        self._cmake.definitions["FMT_INSTALL"] = True
-        self._cmake.definitions["FMT_LIB_DIR"] = "lib"
-        if self._has_with_os_api_option:
-            self._cmake.definitions["FMT_OS"] = self.options.with_os_api
-        self._cmake.configure(build_folder=self._build_subfolder)
-        return self._cmake
+        get(self, **self.conan_data["sources"][str(self.version)], strip_root=True)
 
     def build(self):
-        for patch in self.conan_data.get("patches", {}).get(self.version, []):
-            tools.patch(**patch)
+        apply_conandata_patches(self)
         if not self.options.header_only:
-            cmake = self._configure_cmake()
+            cmake = CMake(self)
+            # FIXME : https://github.com/conan-io/conan/issues/11476
+            # can be replaced by https://docs.conan.io/en/latest/reference/conanfile/tools/cmake/cmaketoolchain.html#cache-variables in 1.50
+            cache_entries = {
+                "FMT_DOC": "False",
+                "FMT_TEST": "False",
+                "FMT_INSTALL": "True",
+                "FMT_LIB_DIR": "lib"
+            }
+            if self._has_with_os_api_option:
+                cache_entries["FMT_OS"] = self.options.with_os_api
+            cmake.configure(variables=cache_entries)
             cmake.build()
 
     def package(self):
-        self.copy("LICENSE.rst", dst="licenses", src=self._source_subfolder)
+        copy(self, pattern="*LICENSE.rst", src=self.source_folder, dst=os.path.join(self.package_folder, "licenses"))
         if self.options.header_only:
-            self.copy("*.h", dst="include", src=os.path.join(self._source_subfolder, "include"))
+            copy(self, pattern="*.h", src=os.path.join(self.source_folder, "include"), dst=os.path.join(self.package_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, "share"))
+            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, "res"))
+            rmdir(self, os.path.join(self.package_folder, "share"))
 
     def package_info(self):
         self.cpp_info.names["cmake_find_package"] = "fmt"
         self.cpp_info.names["cmake_find_package_multi"] = "fmt"
         self.cpp_info.names["pkg_config"] = "fmt"
+
+        target = "fmt-header-only" if self.options.header_only else "fmt"
+        self.cpp_info.set_property("cmake_target_name", "fmt::{}".format(target))
+
+        # TODO: back to global scope in conan v2 once cmake_find_package* generators removed
+        self.cpp_info.components["_fmt"].includedirs.extend(["include"])
         if self.options.header_only:
-            self.cpp_info.components["fmt-header-only"].defines.append("FMT_HEADER_ONLY=1")
+            self.cpp_info.components["_fmt"].defines.append("FMT_HEADER_ONLY=1")
             if self.options.with_fmt_alias:
-                self.cpp_info.components["fmt-header-only"].defines.append("FMT_STRING_ALIAS=1")
+                self.cpp_info.components["_fmt"].defines.append("FMT_STRING_ALIAS=1")
         else:
             postfix = "d" if self.settings.build_type == "Debug" else ""
-            self.cpp_info.libs = ["fmt" + postfix]
+            libname = "fmt" + postfix
+            self.cpp_info.components["_fmt"].libs = [libname]
+            if self.settings.os == "Linux":
+                self.cpp_info.components["_fmt"].system_libs.extend(["m"])
+            # FIXME: remove when Conan 1.50 is used in c3i and update the Conan required version
+            # from that version components don't have empty libdirs by default
+            self.cpp_info.components["_fmt"].libdirs.extend(["lib"])
+            self.cpp_info.components["_fmt"].bindirs.extend(["bin"])
             if self.options.with_fmt_alias:
-                self.cpp_info.defines.append("FMT_STRING_ALIAS=1")
+                self.cpp_info.components["_fmt"].defines.append("FMT_STRING_ALIAS=1")
             if self.options.shared:
-                self.cpp_info.defines.append("FMT_SHARED")
+                self.cpp_info.components["_fmt"].defines.append("FMT_SHARED")
+
+        # TODO: to remove in conan v2 once cmake_find_package* generators removed
+        self.cpp_info.components["_fmt"].names["cmake_find_package"] = target
+        self.cpp_info.components["_fmt"].names["cmake_find_package_multi"] = target
+        self.cpp_info.components["_fmt"].set_property("cmake_target_name", "fmt::{}".format(target))
diff --git a/recipes/fmt/all/test_cmakedeps/conanfile.py b/recipes/fmt/all/test_cmakedeps/conanfile.py
diff --git a/recipes/fmt/all/test_package/CMakeLists.txt b/recipes/fmt/all/test_package/CMakeLists.txt
@@ -1,9 +1,6 @@
 cmake_minimum_required(VERSION 3.15)
 project(test_package CXX)
 
-include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
-conan_basic_setup(TARGETS)
-
 find_package(fmt REQUIRED CONFIG)
 
 # TEST_PACKAGE #################################################################

diff --git a/recipes/fmt/all/test_package/conanfile.py b/recipes/fmt/all/test_package/conanfile.py
@@ -1,19 +1,32 @@
 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
 
-from conans import ConanFile, CMake, tools
-
+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", "VirtualRunEnv"
+
+    def requirements(self):
+        self.requires(self.tested_reference_str)
+
+    def generate(self):
+        tc = CMakeToolchain(self)
+        tc.variables["FMT_HEADER_ONLY"] = self.dependencies["fmt"].options.header_only
+        tc.generate()
+
+    def layout(self):
+        cmake_layout(self)
 
     def build(self):
         cmake = CMake(self)
-        cmake.definitions["FMT_HEADER_ONLY"] = self.options["fmt"].header_only
         cmake.configure()
         cmake.build()
 
     def test(self):
-        if not tools.cross_building(self):
-            self.run(os.path.join("bin", "test_package"), run_environment=True)
-            self.run(os.path.join("bin", "test_ranges"), run_environment=True)
+        if can_run(self):
+            self.run(os.path.join(self.cpp.build.bindirs[0], "test_package"), env="conanrun")
+            self.run(os.path.join(self.cpp.build.bindirs[0], "test_ranges"), env="conanrun")
diff --git a/...pes/fmt/all/test_cmakedeps/CMakeLists.txt → ...es/fmt/all/test_v1_package/CMakeLists.txt b/...pes/fmt/all/test_cmakedeps/CMakeLists.txt → ...es/fmt/all/test_v1_package/CMakeLists.txt
@@ -1,6 +1,9 @@
 cmake_minimum_required(VERSION 3.15)
 project(test_package CXX)
 
+include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
+conan_basic_setup(TARGETS)
+
 find_package(fmt REQUIRED CONFIG)
 
 # TEST_PACKAGE #################################################################

diff --git a/recipes/fmt/all/test_v1_package/conanfile.py b/recipes/fmt/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.definitions["FMT_HEADER_ONLY"] = self.options["fmt"].header_only
+        cmake.configure()
+        cmake.build()
+
+    def test(self):
+        if not tools.cross_building(self):
+            self.run(os.path.join("bin", "test_package"), run_environment=True)
+            self.run(os.path.join("bin", "test_ranges"), run_environment=True)
diff --git a/...s/fmt/all/test_cmakedeps/test_package.cpp → .../fmt/all/test_v1_package/test_package.cpp b/...s/fmt/all/test_cmakedeps/test_package.cpp → .../fmt/all/test_v1_package/test_package.cpp
@@ -5,6 +5,7 @@
 #include <vector>
 #include <limits>
 
+
 #include <fmt/format.h>
 #include <fmt/printf.h>
 #include <fmt/ostream.h>

diff --git a/...es/fmt/all/test_cmakedeps/test_ranges.cpp → ...s/fmt/all/test_v1_package/test_ranges.cpp b/...es/fmt/all/test_cmakedeps/test_ranges.cpp → ...s/fmt/all/test_v1_package/test_ranges.cpp