fix bugs in igntion-tools recipe

recipes/ignition-tools/all/conandata.yml

@@ -1,7 +1,7 @@
 sources:
   "1.4.0":
-    url: "https://github.com/ignitionrobotics/ign-tools/archive/refs/tags/ignition-tools_1.4.0.tar.gz"
-    sha256: "fa3f7984ebb8f412133ea93368395adce426ae36c715a9f94f9509af7dac3b03"
+    url: "https://github.com/gazebosim/gz-tools/archive/refs/tags/ignition-tools_1.4.0.tar.gz"
+    sha256: "8ceebefcd1977dc2e26beede347a9c06d851b89ec0fd7d5c86126f43a49ac178"
 patches:
   "1.4.0":
     - base_path: "source_subfolder"

recipes/ignition-tools/all/conanfile.py

@@ -1,21 +1,23 @@
 import os
 from conans import CMake, ConanFile, tools
 from conans.errors import ConanInvalidConfiguration
+import conan.tools.files
+import textwrap
 
-required_conan_version = ">=1.29.1"
+required_conan_version = ">=1.43.0"
 
 
 class IgnitionToolsConan(ConanFile):
     name = "ignition-tools"
     license = "Apache-2.0"
-    homepage = "https://ignitionrobotics.org/libs/tools"
+    homepage = "https://gazebosim.org/libs/tools"
     url = "https://github.com/conan-io/conan-center-index"
     description = "Provides general purpose classes and functions designed for robotic applications.."
     topics = ("ignition", "robotics", "tools")
     settings = "os", "compiler", "build_type", "arch"
     options = {"shared": [True, False], "fPIC": [True, False]}
     default_options = {"shared": False, "fPIC": True}
-    generators = "cmake", "cmake_find_package_multi"
+    generators = "cmake", "cmake_find_package"
     exports_sources = "CMakeLists.txt", "patches/**"
     _cmake = None
 
@@ -50,9 +52,7 @@ def validate(self):
         min_version = self._minimum_compilers_version.get(str(self.settings.compiler))
         if not min_version:
             self.output.warn(
-                "{} recipe lacks information about the {} compiler support.".format(
-                    self.name, self.settings.compiler
-                )
+                f"{self.name} recipe lacks information about the {self.settings.compiler} compiler support."
             )
         else:
             if tools.Version(self.settings.compiler.version) < min_version:
@@ -65,7 +65,8 @@ def validate(self):
                 )
 
     def source(self):
-        tools.get(**self.conan_data["sources"][self.version],destination=self._source_subfolder, strip_root=True)
+        tools.get(**self.conan_data["sources"][self.version], 
+                strip_root=True, destination=self._source_subfolder)
 
     def _configure_cmake(self):
         if self._cmake is not None:
@@ -93,13 +94,47 @@ def package(self):
         for dll_pattern_to_remove in ["concrt*.dll", "msvcp*.dll", "vcruntime*.dll"]:
             tools.remove_files_by_mask(os.path.join(self.package_folder, "bin"), dll_pattern_to_remove)
 
+        self._create_cmake_module_variables(
+            os.path.join(self.package_folder, self._module_file_rel_path),
+                tools.Version(self.version))
+
+    @staticmethod
+    def _create_cmake_module_variables(module_file, version):
+        content = textwrap.dedent("""\
+            set(IGN_TOOLS_CONAN_PACKAGE_DIR ${{CMAKE_CURRENT_LIST_DIR/../..}})
+            list(APPEND IGNITION-TOOLS_BINARY_DIRS ${{IGN_TOOLS_CONAN_PACKAGE_DIR}}/bin)
+            list(APPEND IGNITION-TOOLS_INCLUDE_DIRS ${{IGN_TOOLS_CONAN_PACKAGE_DIR}}/include)
+            list(APPEND IGNITION-TOOLS_LIBRARY_DIRS ${{IGN_TOOLS_CONAN_PACKAGE_DIR}}/libs)
+            list(APPEND IGNITION-TOOLS_CFLAGS -I/${{IGN_TOOLS_CONAN_PACKAGE_DIR}}/include)
+            list(APPEND IGNITION-TOOLS_CXX_FLAGS -std=c++11)
+            set(ignition-tools{major}_VERSION_MAJOR {major})
+            set(ignition-tools{major}_VERSION_MINOR {minor})
+            set(ignition-tools{major}_VERSION_PATCH {patch})
+            set(ignition-tools{major}_VERSION_STRING "{major}.{minor}.{patch}")
+        """.format(major=version.major, minor=version.minor, patch=version.patch))
+        tools.save(module_file, content)
+
     def package_info(self):
-        version_major = tools.Version(self.version).major
-        self.cpp_info.names["cmake_find_package"] = "ignition-tools{}".format(version_major)
-        self.cpp_info.names["cmake_find_package_multi"] = "ignition-tools{}".format(version_major)
-
-        self.cpp_info.components["libignition-tools"].libs = ["ignition-tools-backward"]
-        self.cpp_info.components["libignition-tools"].includedirs.append("include/ignition/tools{}".format(version_major))
-        self.cpp_info.components["libignition-tools"].names["cmake_find_package"] = "ignition-tools{}".format(version_major)
-        self.cpp_info.components["libignition-tools"].names["cmake_find_package_multi"] = "ignition-tools{}".format(version_major)
-        self.cpp_info.components["libignition-tools"].names["pkg_config"] = "ignition-tools{}".format(version_major)
+        lib_name = "ignition-tools"
+        self.cpp_info.names["cmake_find_package"] = lib_name
+        self.cpp_info.names["cmake_find_package_multi"] = lib_name
+        self.cpp_info.set_property("cmake_file_name", "ignition-tools")
+        self.cpp_info.components["backward"].names["cmake_find_package"] = "backward"
+        self.cpp_info.components["backward"].names["cmake_find_package_multi"] = "backward"
+        self.cpp_info.components["backward"].bindirs = ["bin"]
+
+        self.cpp_info.components["backward"].libs = []
+        self.cpp_info.components["backward"].includedirs = []
+        if int(tools.Version(self.version).minor) > 2:
+            self.cpp_info.components["backward"].libs.append(lib_name +"-backward")
+        self.cpp_info.components["backward"].builddirs.append(self._module_dir_rel_path)
+        self.cpp_info.set_property("cmake_build_modules", [self._module_file_rel_path])
+        self.cpp_info.components["backward"].build_modules["cmake_find_package"] = [self._module_file_rel_path]
+        self.cpp_info.components["backward"].build_modules["cmake_find_package_multi"] = [self._module_file_rel_path]
+
+    @property
+    def _module_dir_rel_path(self):
+        return os.path.join("lib", "cmake")
+    @property
+    def _module_file_rel_path(self):
+        return os.path.join(self._module_dir_rel_path, f"conan-official-{self.name}-variables.cmake")

recipes/ignition-tools/all/test_package/CMakeLists.txt

@@ -4,16 +4,10 @@ project(test_package)
 include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
 conan_basic_setup(TARGETS)
 
-set(IGN_TOOLS_MAJOR_VER "" CACHE STRING "Version of igition-tools")
-
-if(NOT IGN_TOOLS_MAJOR_VER)
-    message(FATAL_ERROR "IGN_MAJOR_MAJOR_VER not set")
-endif()
-
-find_package(ignition-tools${IGN_TOOLS_MAJOR_VER} REQUIRED CONFIG)
+find_package(ignition-tools REQUIRED COMPONENTS backward CONFIG)
 
 add_executable(${PROJECT_NAME} test_package.cpp)
-target_link_libraries(${PROJECT_NAME} ignition-tools${IGN_TOOLS_MAJOR_VER}::ignition-tools${IGN_TOOLS_MAJOR_VER})
+target_link_libraries(${PROJECT_NAME} ignition-tools::backward)
 set_target_properties(${PROJECT_NAME} PROPERTIES
     CXX_STANDARD 17
     CXX_STANDARD_REQUIRED ON

recipes/ignition-tools/all/test_package/conanfile.py

@@ -1,3 +1,4 @@
+# pylint: skip-file
 from conans import ConanFile, CMake, tools
 import os
 
@@ -7,7 +8,6 @@ class TestPackageConan(ConanFile):
 
     def build(self):
         cmake = CMake(self)
-        cmake.definitions["IGN_TOOLS_MAJOR_VER"] = tools.Version(self.deps_cpp_info["ignition-tools"].version).major
         cmake.configure()
         cmake.build()