glbinding: modernize

recipes/glbinding/all/CMakeLists.txt

@@ -1,7 +1,7 @@
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required(VERSION 3.1)
 project(cmake_wrapper)
 
 include(conanbuildinfo.cmake)
-conan_basic_setup()
+conan_basic_setup(KEEP_RPATHS)
 
 add_subdirectory(source_subfolder)

recipes/glbinding/all/conanfile.py

@@ -1,40 +1,54 @@
 from conans import ConanFile, CMake, tools
+import functools
 import os
 
+required_conan_version = ">=1.43.0"
+
 
 class GlbindingConan(ConanFile):
     name = "glbinding"
     description = "A C++ binding for the OpenGL API, generated using the gl.xml specification."
     license = "MIT"
-    topics = ("conan", "glbinding", "opengl", "binding")
+    topics = ("glbinding", "opengl", "binding")
     homepage = "https://glbinding.org/"
     url = "https://github.com/conan-io/conan-center-index"
 
     settings = "os", "arch", "compiler", "build_type"
-    options = {"shared": [True, False], "fPIC": [True, False]}
-    default_options = {"shared": False, "fPIC": True}
+    options = {
+        "shared": [True, False],
+        "fPIC": [True, False],
+    }
+    default_options = {
+        "shared": False,
+        "fPIC": True,
+    }
 
-    exports_sources = ["CMakeLists.txt", "patches/**"]
     generators = "cmake"
-    _cmake = None
 
     @property
     def _source_subfolder(self):
         return "source_subfolder"
 
+    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 config_options(self):
         if self.settings.os == "Windows":
             del self.options.fPIC
 
     def configure(self):
         if self.options.shared:
             del self.options.fPIC
-        if self.settings.compiler.cppstd:
+
+    def validate(self):
+        if self.settings.compiler.get_safe("cppstd"):
             tools.check_min_cppstd(self, 11)
 
     def source(self):
-        tools.get(**self.conan_data["sources"][self.version])
-        os.rename(self.name + "-" + self.version, self._source_subfolder)
+        tools.get(**self.conan_data["sources"][self.version],
+                  destination=self._source_subfolder, strip_root=True)
 
     def _patch_sources(self):
         for patch in self.conan_data.get("patches", {}).get(self.version, []):
@@ -48,20 +62,22 @@ def _patch_sources(self):
         # No whole program optimization
         tools.replace_in_file(os.path.join(self._source_subfolder, "cmake", "CompileOptions.cmake"),
                               "/GL", "")
+        # Don't populate rpath
+        tools.replace_in_file(os.path.join(self._source_subfolder, "CMakeLists.txt"),
+                              "if(NOT SYSTEM_DIR_INSTALL)", "if(0)")
 
+    @functools.lru_cache(1)
     def _configure_cmake(self):
-        if self._cmake:
-            return self._cmake
-        self._cmake = CMake(self)
-        self._cmake.definitions["OPTION_SELF_CONTAINED"] = False
-        self._cmake.definitions["OPTION_BUILD_TESTS"] = False
-        self._cmake.definitions["OPTION_BUILD_DOCS"] = False
-        self._cmake.definitions["OPTION_BUILD_TOOLS"] = False
-        self._cmake.definitions["OPTION_BUILD_EXAMPLES"] = False
-        self._cmake.definitions["OPTION_BUILD_WITH_BOOST_THREAD"] = False
-        self._cmake.definitions["OPTION_BUILD_CHECK"] = False
-        self._cmake.configure()
-        return self._cmake
+        cmake = CMake(self)
+        cmake.definitions["OPTION_SELF_CONTAINED"] = False
+        cmake.definitions["OPTION_BUILD_TESTS"] = False
+        cmake.definitions["OPTION_BUILD_DOCS"] = False
+        cmake.definitions["OPTION_BUILD_TOOLS"] = False
+        cmake.definitions["OPTION_BUILD_EXAMPLES"] = False
+        cmake.definitions["OPTION_BUILD_WITH_BOOST_THREAD"] = False
+        cmake.definitions["OPTION_BUILD_CHECK"] = False
+        cmake.configure()
+        return cmake
 
     def build(self):
         self._patch_sources()
@@ -76,23 +92,32 @@ def package(self):
         tools.rmdir(os.path.join(self.package_folder, "share"))
 
     def package_info(self):
-        self.cpp_info.names["cmake_find_package"] = "glbinding"
-        self.cpp_info.names["cmake_find_package_multi"] = "glbinding"
+        self.cpp_info.set_property("cmake_file_name", "glbinding")
 
         suffix = "d" if self.settings.build_type == "Debug" else ""
         # glbinding
-        self.cpp_info.components["_glbinding"].names["cmake_find_package"] = "glbinding"
-        self.cpp_info.components["_glbinding"].names["cmake_find_package_multi"] = "glbinding"
+        self.cpp_info.components["_glbinding"].set_property("cmake_target_name", "glbinding::glbinding")
         self.cpp_info.components["_glbinding"].libs = ["glbinding" + suffix]
         self.cpp_info.components["_glbinding"].requires = ["khrplatform"]
-        if self.settings.os == "Linux":
+        if self.settings.os in ["Linux", "FreeBSD"]:
             self.cpp_info.components["_glbinding"].system_libs = ["dl", "pthread"]
         # glbinding-aux
-        self.cpp_info.components["glbinding-aux"].names["cmake_find_package"] = "glbinding-aux"
-        self.cpp_info.components["glbinding-aux"].names["cmake_find_package_multi"] = "glbinding-aux"
+        self.cpp_info.components["glbinding-aux"].set_property("cmake_target_name", "glbinding::glbinding-aux")
         self.cpp_info.components["glbinding-aux"].libs = ["glbinding-aux" + suffix]
         self.cpp_info.components["glbinding-aux"].requires = ["_glbinding"]
         # KHRplatform
+        self.cpp_info.components["khrplatform"].set_property("cmake_target_name", "glbinding::KHRplatform")
+        self.cpp_info.components["khrplatform"].libdirs = []
+
+        # workaround to propagate all components in CMakeDeps generator
+        self.cpp_info.set_property("cmake_file_name", "glbinding::glbinding-aux")
+
+        # TODO: to remove in conan v2 once cmake_find_package_* generators removed
+        self.cpp_info.names["cmake_find_package"] = "glbinding"
+        self.cpp_info.names["cmake_find_package_multi"] = "glbinding"
+        self.cpp_info.components["_glbinding"].names["cmake_find_package"] = "glbinding"
+        self.cpp_info.components["_glbinding"].names["cmake_find_package_multi"] = "glbinding"
+        self.cpp_info.components["glbinding-aux"].names["cmake_find_package"] = "glbinding-aux"
+        self.cpp_info.components["glbinding-aux"].names["cmake_find_package_multi"] = "glbinding-aux"
         self.cpp_info.components["khrplatform"].names["cmake_find_package"] = "KHRplatform"
         self.cpp_info.components["khrplatform"].names["cmake_find_package_multi"] = "KHRplatform"
-        self.cpp_info.components["khrplatform"].libdirs = []

recipes/glbinding/all/test_package/CMakeLists.txt

@@ -5,7 +5,8 @@ include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
 conan_basic_setup(TARGETS)
 
 find_package(glbinding REQUIRED CONFIG)
+find_package(glfw3 REQUIRED CONFIG)
 
 add_executable(${PROJECT_NAME} test_package.cpp)
-target_link_libraries(${PROJECT_NAME} glbinding::glbinding CONAN_PKG::glfw)
+target_link_libraries(${PROJECT_NAME} glbinding::glbinding glfw)
 set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 11)

recipes/glbinding/all/test_package/conanfile.py

@@ -7,14 +7,14 @@ class TestPackageConan(ConanFile):
     generators = "cmake", "cmake_find_package_multi"
 
     def requirements(self):
-        self.requires("glfw/3.3.2")
+        self.requires("glfw/3.3.7")
 
     def build(self):
         cmake = CMake(self)
         cmake.configure()
         cmake.build()
 
     def test(self):
-        if not tools.cross_building(self.settings):
+        if not tools.cross_building(self):
             bin_path = os.path.join("bin", "test_package")
             self.run(bin_path, run_environment=True)