Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

qtawesome: add v6.5.1 #22369

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions recipes/qtawesome/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
sources:
"6.5.1":
url: "https://github.com/gamecreature/QtAwesome/archive/font-awesome-6.5.1.tar.gz"
sha256: "679ffa184d4b17b0ba62ea4ee94c4ab3dc5fa0373222b1d8b485341588696979"
"6.4.0":
url: "https://github.com/gamecreature/QtAwesome/archive/font-awesome-6.4.0.tar.gz"
sha256: "4310aba189e0bba4090997ecfefe27c2c7595aa499b790389dabdce5b4e54f5a"
Expand Down
9 changes: 6 additions & 3 deletions recipes/qtawesome/all/conanfile.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from conan import ConanFile
from conan.errors import ConanInvalidConfiguration
from conan.tools.microsoft import check_min_vs, is_msvc_static_runtime, is_msvc
from conan.tools.files import apply_conandata_patches, export_conandata_patches, get, copy
from conan.tools.files import apply_conandata_patches, export_conandata_patches, get, copy, rmdir
from conan.tools.build import check_min_cppstd
from conan.tools.env import VirtualRunEnv
from conan.tools.scm import Version
Expand Down Expand Up @@ -60,7 +60,7 @@ def layout(self):
cmake_layout(self, src_folder="src")

def requirements(self):
self.requires("qt/5.15.9", transitive_headers=True, transitive_libs=True)
self.requires("qt/[~5.15]", transitive_headers=True, transitive_libs=True)

def validate(self):
if self.settings.compiler.cppstd:
Expand All @@ -72,7 +72,7 @@ def validate(self):
raise ConanInvalidConfiguration(
f"{self.ref} requires C++{self._min_cppstd}, which your compiler does not support."
)
if self.settings.os == "Linux":
if self.version == "6.4.0" and self.settings.os == "Linux":
raise ConanInvalidConfiguration("Linux is not supported yet")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if Linux is not also supported by the 6.4.0.


def source(self):
Expand Down Expand Up @@ -101,6 +101,9 @@ def package(self):
copy(self, pattern="LICENSE.md", dst=os.path.join(self.package_folder, "licenses"), src=self.source_folder)
cmake = CMake(self)
cmake.install()
rmdir(self, os.path.join(self.package_folder, "lib", "cmake"))

def package_info(self):
self.cpp_info.libs = ["QtAwesome"]
if Version(self.version) >= "6.5":
self.cpp_info.includedirs.append(os.path.join("include", "QtAwesome"))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you sure it is needed ?

2 changes: 2 additions & 0 deletions recipes/qtawesome/config.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
versions:
"6.5.1":
folder: all
"6.4.0":
folder: all
Loading