[gtk/msvc-cmake-dep: 3/3] meson.build: Use CMake to find libjpeg on MSVC-like builds




commit 2e34d6211171c1ceabec33c01e0fc1982ee00cf1
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Mon Feb 21 17:50:15 2022 +0800

    meson.build: Use CMake to find libjpeg on MSVC-like builds
    
    One may be using IJG libjpeg or libjpeg-turbo to build GTK, and their
    build files may or may not generate pkg-config files for us.  To make
    things easier, we can make use of CMake's built-in support for finding
    IJG libjpeg or libjpeg-turbo.

 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/meson.build b/meson.build
index 4a1e41d4a5..1be01835e4 100644
--- a/meson.build
+++ b/meson.build
@@ -422,7 +422,7 @@ png_dep        = dependency(is_msvc_like ? 'png' : 'libpng',
 tiff_dep       = dependency(is_msvc_like ? 'tiff' : 'libtiff-4',
                             fallback: ['libtiff', 'libtiff4_dep'],
                             required: true)
-jpeg_dep       = dependency('libjpeg',
+jpeg_dep       = dependency(is_msvc_like ? 'jpeg' : 'libjpeg',
                             fallback: ['libjpeg-turbo', 'jpeg_dep'],
                             required: true)
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]