Skip to content

Commit

Permalink
daggy: tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
valgur committed Dec 5, 2023
1 parent 4fd6d7a commit c231bc0
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 9 deletions.
5 changes: 3 additions & 2 deletions recipes/daggy/2.1/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ class DaggyConan(ConanFile):
license = "MIT"
url = "https://github.com/conan-io/conan-center-index"
homepage = "https://github.com/synacker/daggy"
topics = ("streaming", "qt", "monitoring", "process", "stream-processing", "extensible", "serverless-framework", "aggregation", "ssh2", "cross-platform", "ssh-client")
topics = ("streaming", "qt", "monitoring", "process", "stream-processing", "extensible",
"serverless-framework", "aggregation", "ssh2", "cross-platform", "ssh-client")

package_type = "library"
settings = "os", "arch", "compiler", "build_type"
Expand Down Expand Up @@ -64,7 +65,7 @@ def layout(self):

def requirements(self):
# Qt is used in the public headers
self.requires("qt/6.6.0", transitive_headers=True, transitive_libs=True)
self.requires("qt/6.6.1", transitive_headers=True, transitive_libs=True)
self.requires("kainjow-mustache/4.1")
if self.options.with_yaml:
self.requires("yaml-cpp/0.8.0")
Expand Down
3 changes: 0 additions & 3 deletions recipes/daggy/2.1/test_package/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ class TestPackageConan(ConanFile):
def requirements(self):
self.requires(self.tested_reference_str)

def build_requirements(self):
self.tool_requires("cmake/[>=3.21 <4]")

def layout(self):
cmake_layout(self)

Expand Down
5 changes: 1 addition & 4 deletions recipes/daggy/2.1/test_v1_package/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,7 @@

class DaggyTestConan(ConanFile):
settings = "os", "compiler", "build_type", "arch"
generators = "cmake", "cmake_find_package_multi", "cmake_paths", "cmake_find_package"

def build_requirements(self):
self.build_requires("cmake/[>=3.21 <4]")
generators = "cmake", "cmake_find_package_multi"

def build(self):
cmake = CMake(self)
Expand Down

0 comments on commit c231bc0

Please sign in to comment.