freetype-commit
[Top][All Lists]
Advanced

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

[Git][freetype/freetype][master] meson.build: Minor formatting.


From: Werner Lemberg
Subject: [Git][freetype/freetype][master] meson.build: Minor formatting.
Date: Mon, 08 Mar 2021 09:43:34 +0000

Werner Lemberg pushed to branch master at FreeType / FreeType

Commits:

1 changed file:

Changes:

  • meson.build
    ... ... @@ -183,6 +183,7 @@ has_fcntl_h = cc.has_header('fcntl.h')
    183 183
     has_sys_mman_h = cc.has_header('sys/mman.h')
    
    184 184
     
    
    185 185
     mmap_option = get_option('mmap')
    
    186
    +
    
    186 187
     if mmap_option.disabled()
    
    187 188
       ft2_sources += files(['src/base/ftsystem.c',])
    
    188 189
     elif host_machine.system() == 'windows'
    
    ... ... @@ -231,7 +232,10 @@ ftoption_command = process_header_command
    231 232
     
    
    232 233
     
    
    233 234
     # GZip support
    
    234
    -zlib_dep = dependency('zlib', required: get_option('zlib'), fallback: 'zlib')
    
    235
    +zlib_dep = dependency('zlib',
    
    236
    +  required: get_option('zlib'),
    
    237
    +  fallback: 'zlib')
    
    238
    +
    
    235 239
     if zlib_dep.found()
    
    236 240
       ftoption_command += [
    
    237 241
         '--enable=FT_CONFIG_OPTION_USE_ZLIB',
    
    ... ... @@ -244,7 +248,9 @@ else
    244 248
     endif
    
    245 249
     
    
    246 250
     # BZip2 support
    
    247
    -bzip2_dep = cc.find_library('bz2', required: get_option('bzip2'))
    
    251
    +bzip2_dep = cc.find_library('bz2',
    
    252
    +  required: get_option('bzip2'))
    
    253
    +
    
    248 254
     if bzip2_dep.found()
    
    249 255
       ftoption_command += ['--enable=FT_CONFIG_OPTION_USE_BZIP2']
    
    250 256
       ft2_sources += files(['src/bzip2/ftbzip2.c',])
    
    ... ... @@ -252,7 +258,10 @@ if bzip2_dep.found()
    252 258
     endif
    
    253 259
     
    
    254 260
     # PNG support
    
    255
    -libpng_dep = dependency('libpng', required: get_option('png'), fallback: 'libpng')
    
    261
    +libpng_dep = dependency('libpng',
    
    262
    +  required: get_option('png'),
    
    263
    +  fallback: 'libpng')
    
    264
    +
    
    256 265
     if libpng_dep.found()
    
    257 266
       ftoption_command += ['--enable=FT_CONFIG_OPTION_USE_PNG']
    
    258 267
       ft2_deps += [libpng_dep]
    
    ... ... @@ -260,15 +269,18 @@ endif
    260 269
     
    
    261 270
     # Harfbuzz support
    
    262 271
     harfbuzz_dep = dependency('harfbuzz',
    
    263
    -                 version: '>= 2.0.0',
    
    264
    -                 required: get_option('harfbuzz'))
    
    272
    +  version: '>= 2.0.0',
    
    273
    +  required: get_option('harfbuzz'))
    
    274
    +
    
    265 275
     if harfbuzz_dep.found()
    
    266 276
       ftoption_command += ['--enable=FT_CONFIG_OPTION_USE_HARFBUZZ']
    
    267 277
       ft2_deps += [harfbuzz_dep]
    
    268 278
     endif
    
    269 279
     
    
    270 280
     # Brotli decompression support
    
    271
    -brotli_dep = dependency('libbrotlidec', required: get_option('brotli'))
    
    281
    +brotli_dep = dependency('libbrotlidec',
    
    282
    +  required: get_option('brotli'))
    
    283
    +
    
    272 284
     if brotli_dep.found()
    
    273 285
       ftoption_command += ['--enable=FT_CONFIG_OPTION_USE_BROTLI']
    
    274 286
       ft2_deps += [brotli_dep]
    
    ... ... @@ -330,6 +342,7 @@ freetype_dep = declare_dependency(
    330 342
       include_directories: ft2_includes,
    
    331 343
       link_with: ft2_lib,
    
    332 344
       version: ft2_pkgconfig_version)
    
    345
    +
    
    333 346
     meson.override_dependency('freetype2', freetype_dep)
    
    334 347
     
    
    335 348
     
    
    ... ... @@ -337,7 +350,7 @@ meson.override_dependency('freetype2', freetype_dep)
    337 350
     # i.e., the subdir value seems to be ignored, contrary to examples in the
    
    338 351
     # Meson documentation.
    
    339 352
     install_headers('include/ft2build.h',
    
    340
    -   install_dir: 'include/freetype2')
    
    353
    +  install_dir: 'include/freetype2')
    
    341 354
     install_headers(ft2_public_headers,
    
    342 355
       install_dir: 'include/freetype2/freetype')
    
    343 356
     install_headers(ft2_config_headers,
    
    ... ... @@ -345,6 +358,7 @@ install_headers(ft2_config_headers,
    345 358
     
    
    346 359
     
    
    347 360
     pkgconfig = import('pkgconfig')
    
    361
    +
    
    348 362
     pkgconfig.generate(ft2_lib,
    
    349 363
       filebase: 'freetype2',
    
    350 364
       name: 'FreeType 2',
    


  • reply via email to

    [Prev in Thread] Current Thread [Next in Thread]