Use jpeg targets in cmake

dirkvdb · Sep 13, 2024 · cbcb2f6 · cbcb2f6
1 parent cec7c76
commit cbcb2f6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -20,7 +20,7 @@ jobs:
           submodules: true
       - name: Install linux dependencies
         if: ${{ matrix.cfg.os == 'ubuntu-latest' }}
-        run: sudo apt-get install build-essential ninja-build libavcodec-dev libavformat-dev libavutil-dev libswscale-dev
+        run: sudo apt-get install build-essential ninja-build libavcodec-dev libavfilter-dev libavformat-dev libavutil-dev libswscale-dev
       - name: Install osx dependencies
         if: ${{ matrix.cfg.os == 'macos-latest' }}
         run: brew install ninja cmake ffmpeg

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -53,7 +53,7 @@ if (NOT TARGET FFmpeg::avcodec)
 endif ()
 
 find_package(JPEG)
-if (JPEG_FOUND)
+if (TARGET JPEG::JPEG)
     set(HAVE_JPEG ON)
 endif ()
 
@@ -97,8 +97,8 @@ target_link_libraries(libffmpegthumbnailerobj
     FFmpeg::avcodec
     FFmpeg::avutil
     FFmpeg::avfilter
-    $<$<BOOL:${HAVE_JPEG}>:${JPEG_LIBRARIES}>
-    $<$<BOOL:${HAVE_PNG}>:PNG::PNG>
+    $<TARGET_NAME_IF_EXISTS:JPEG::JPEG>
+    $<TARGET_NAME_IF_EXISTS:PNG::PNG>
 )
 
 # we use our own deprecated struct menbers, so disable the warning about it