diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e4ccad7..4a209a5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -44,7 +44,7 @@ jobs: uses: jurplel/install-qt-action@v3 with: cache: 'true' - version: 6.4.0 + version: 6.7.2 modules: qt5compat qtpositioning qtwebchannel qtwebengine qtwebview dir: "${{ github.workspace }}/qt/" diff --git a/conanfile.py b/conanfile.py index 6aab1fe..645b573 100644 --- a/conanfile.py +++ b/conanfile.py @@ -8,8 +8,11 @@ class Diesel(ConanFile): settings = "os", "compiler", "build_type", "arch" generators = "CMakeToolchain", "CMakeDeps" + def layout(self): + self.folders.generators = os.path.join(self.folders.build, "generators") + def requirements(self): - self.requires("qt6keychain/0.14.1@anotherfoxguy/stable") + self.requires("qt6keychain/0.14.3@anotherfoxguy/stable") def generate(self): for dep in self.dependencies.values(): diff --git a/recipes/qtkeychain/conandata.yml b/recipes/qtkeychain/conandata.yml index 68d0350..44978e3 100644 --- a/recipes/qtkeychain/conandata.yml +++ b/recipes/qtkeychain/conandata.yml @@ -1,4 +1,7 @@ sources: + "0.14.3": + url: "https://github.com/frankosterfeld/qtkeychain/archive/refs/tags/0.14.3.tar.gz" + sha256: "a22c708f351431d8736a0ac5c562414f2b7bb919a6292cbca1ff7ac0849cb0a7" "0.14.1": url: "https://github.com/frankosterfeld/qtkeychain/archive/refs/tags/0.14.1.tar.gz" sha256: "afb2d120722141aca85f8144c4ef017bd74977ed45b80e5d9e9614015dadd60c" \ No newline at end of file diff --git a/recipes/qtkeychain/conanfile.py b/recipes/qtkeychain/conanfile.py index bceb67c..e6027d4 100644 --- a/recipes/qtkeychain/conanfile.py +++ b/recipes/qtkeychain/conanfile.py @@ -5,7 +5,6 @@ class QtkeychainConan(ConanFile): name = "qt6keychain" - version = "0.14.1" license = "BSD-3" author = "Edgar" url = "https://github.com/AnotherFoxGuy/diesel-scm" @@ -25,7 +24,7 @@ def generate(self): tc.variables["QTKEYCHAIN_STATIC"] = self.options.static tc.variables["BUILD_WITH_QT6"] = "ON" tc.variables["BUILD_TEST_APPLICATION"] = "OFF" - tc.variables["CMAKE_PREFIX_PATH"] = "E:/Qt/6.5.0/msvc2019_64" + # tc.variables["CMAKE_PREFIX_PATH"] = "E:/Qt/6.7.2/msvc2019_64" tc.generate() deps = CMakeDeps(self) deps.generate()