From aeb776f2f460489eb7753523e3cd59af9aaf4ef0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Mon, 4 Sep 2023 23:42:24 +0200 Subject: [PATCH 1/2] Install libjpeg-turbo::jpeg reqired from qjpeg.dll --- CMakeLists.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 33a3e6df4b9..71e51aa9008 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2504,6 +2504,14 @@ else() if(QT6 AND (WIN32 OR APPLE)) # Qt6 does not automatically install plugins like in Qt 5 + find_package(libjpeg-turbo CONFIG REQUIRED) + install(IMPORTED_RUNTIME_ARTIFACTS + # QJpegPlugin dependency + libjpeg-turbo::jpeg + DESTINATION "${MIXXX_INSTALL_DATADIR}" + RUNTIME_DEPENDENCY_SET mixxx + COMPONENT applocal) + install(IMPORTED_RUNTIME_ARTIFACTS # platform plugins Qt${QT_VERSION_MAJOR}::QOffscreenIntegrationPlugin From ba693f408c20d78c6e445ab8f1d1e5b007861d84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Mon, 4 Sep 2023 23:43:46 +0200 Subject: [PATCH 2/2] Revert "ci: Temporarily disable broken tests due to Qt6 switch on Windows" This reverts commit afdef35b6b79f0280f9de39624114424978c92fa. --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b5b606fe87f..5c95f67b710 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -123,7 +123,7 @@ jobs: cc: cl cxx: cl # TODO: Fix these broken tests on Windows - ctest_args: --exclude-regex '^(AutoDJProcessorTest.*|CoverArtCacheTest\.loadCoverFromFile.*|CoverArtUtilTest\.extractEmbeddedCover|CoverArtUtilTest\.searchImage|TrackUpdateTest\.parseModified.*)$' + ctest_args: --exclude-regex '^AutoDJProcessorTest.*$' cpack_generator: WIX compiler_cache: sccache compiler_cache_path: C:\Users\runneradmin\AppData\Local\Mozilla\sccache\cache