lib/cpp-httplib
1
0
Fork 0
mirror of synced 2025-09-04 02:21:59 +03:00
Code Activity

build(meson): fix new build option names (#2208)

Browse Source 
This is a follow-up to commit 4ff7a1c858,
which introduced new simplified build options and deprecated the old
ones. I forgot to also change the various get_option() calls,
effectively rendering the new option names useless, as they would not
get honoured.
This commit is contained in:
Andrea Pappacoda
2025-08-19 21:22:08 +02:00
committed by GitHub
parent fbd6ce7a3f
commit fe7fe15d2e
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
meson.build
View File

@@ -39,12 +39,12 @@ endif
deps = [dependency('threads')] deps = [dependency('threads')]
args = [] args = []
openssl_dep = dependency('openssl', version: '>=3.0.0', required: get_option('cpp-httplib_openssl')) openssl_dep = dependency('openssl', version: '>=3.0.0', required: get_option('openssl'))
if openssl_dep.found() if openssl_dep.found()
deps += openssl_dep deps += openssl_dep
args += '-DCPPHTTPLIB_OPENSSL_SUPPORT' args += '-DCPPHTTPLIB_OPENSSL_SUPPORT'
if host_machine.system() == 'darwin' if host_machine.system() == 'darwin'
macosx_keychain_dep = dependency('appleframeworks', modules: ['CoreFoundation', 'Security'], required: get_option('cpp-httplib_macosx_keychain')) macosx_keychain_dep = dependency('appleframeworks', modules: ['CoreFoundation', 'Security'], required: get_option('macosx_keychain'))
if macosx_keychain_dep.found() if macosx_keychain_dep.found()
deps += macosx_keychain_dep deps += macosx_keychain_dep
args += '-DCPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN' args += '-DCPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN'
@@ -52,15 +52,15 @@ if openssl_dep.found()
endif endif
endif endif
zlib_dep = dependency('zlib', required: get_option('cpp-httplib_zlib')) zlib_dep = dependency('zlib', required: get_option('zlib'))
if zlib_dep.found() if zlib_dep.found()
deps += zlib_dep deps += zlib_dep
args += '-DCPPHTTPLIB_ZLIB_SUPPORT' args += '-DCPPHTTPLIB_ZLIB_SUPPORT'
endif endif
brotli_deps = [dependency('libbrotlicommon', required: get_option('cpp-httplib_brotli'))] brotli_deps = [dependency('libbrotlicommon', required: get_option('brotli'))]
brotli_deps += dependency('libbrotlidec', required: get_option('cpp-httplib_brotli')) brotli_deps += dependency('libbrotlidec', required: get_option('brotli'))
brotli_deps += dependency('libbrotlienc', required: get_option('cpp-httplib_brotli')) brotli_deps += dependency('libbrotlienc', required: get_option('brotli'))
brotli_found_all = true brotli_found_all = true
foreach brotli_dep : brotli_deps foreach brotli_dep : brotli_deps
@@ -74,7 +74,7 @@ if brotli_found_all
args += '-DCPPHTTPLIB_BROTLI_SUPPORT' args += '-DCPPHTTPLIB_BROTLI_SUPPORT'
endif endif
async_ns_opt = get_option('cpp-httplib_non_blocking_getaddrinfo') async_ns_opt = get_option('non_blocking_getaddrinfo')
if host_machine.system() == 'windows' if host_machine.system() == 'windows'
async_ns_dep = cxx.find_library('ws2_32', required: async_ns_opt) async_ns_dep = cxx.find_library('ws2_32', required: async_ns_opt)
@@ -91,7 +91,7 @@ endif
cpp_httplib_dep = dependency('', required: false) cpp_httplib_dep = dependency('', required: false)
if get_option('cpp-httplib_compile') if get_option('compile')
python3 = find_program('python3') python3 = find_program('python3')
httplib_ch = custom_target( httplib_ch = custom_target(
@@ -135,6 +135,6 @@ endif
meson.override_dependency('cpp-httplib', cpp_httplib_dep) meson.override_dependency('cpp-httplib', cpp_httplib_dep)
if get_option('cpp-httplib_test') if get_option('test')
subdir('test') subdir('test')
endif endif