Skip to content

Commit

Permalink
Fix conan badge, disable CMakeDeps generator
Browse files Browse the repository at this point in the history
  • Loading branch information
Tereius committed Nov 24, 2024
1 parent d3d84dd commit 5a06095
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# conan-qtkeychain

[![Conan Remote Recipe](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fapi.github.com%2Frepos%2FPrivatehive%2Fconan-qtkeychain%2Fproperties%2Fvalues&query=%24%5B%3F(%40.property_name%20%3D%3D%20'conan-package')%5D.value&style=flat&logo=conan&label=conan&color=%232980b9)](https://conan.privatehive.de/ui/repos/tree/General/public-conan/de.privatehive)
[![Conan Remote Recipe](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fapi.github.com%2Frepos%2FPrivatehive%2Fconan-qtkeychain%2Fproperties%2Fvalues&query=%24%5B0%5D.value&style=flat&logo=conan&label=conan&color=%232980b9)](https://conan.privatehive.de/ui/repos/tree/General/public-conan/de.privatehive/qtkeychain)

#### A conan package that provides the qtkeychain library

Expand Down
3 changes: 2 additions & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def validate(self):
valid_os = ["Windows", "Linux", "Android"]
if str(self.settings.os) not in valid_os:
raise ConanInvalidConfiguration(f"{self.name} {self.version} is only supported for the following operating systems: {valid_os}")
valid_arch = ["x86_64", "x86", "armv7", "armv8"]
valid_arch = ["x86_64", "x86", "armv6", "armv7", "armv8"]
if str(self.settings.arch) not in valid_arch:
raise ConanInvalidConfiguration(f"{self.name} {self.version} is only supported for the following architectures on {self.settings.os}: {valid_arch}")
if self.settings.os == "Linux" and not self.dependencies["qt"].options.dbus:
Expand Down Expand Up @@ -88,4 +88,5 @@ def package(self):
cmake.install()

def package_info(self):
self.cpp_info.set_property("cmake_find_mode", "none")
self.cpp_info.builddirs = ["lib/cmake"]

0 comments on commit 5a06095

Please sign in to comment.