Merge pull request mixxxdj#11922 from daschuer/libjpeg_install

Install libjpeg-turbo::jpeg to fix cover display with Qt6
xorik · Sep 5, 2023 · e997b17 · e997b17
2 parents a2b2786 + ba693f4
commit e997b17
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git 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

diff --git 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