Merge pull request #1272 from dgreatwood/fallbackHttplibMacOSAndLinux

Fix: Extended the homebrew Httplib Nofallback Workaround to Linux
pistacheio · Dec 23, 2024 · ddffda8 · ddffda8
2 parents 9f4a8b3 + d783e9d
commit ddffda8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/tests/meson.build b/tests/meson.build
@@ -16,7 +16,9 @@ gmock_dep = dependency('gmock', version: '>=1.11.0', fallback: ['gtest', 'gmock_
 # dependency, in preference to using a subproject). We workaround the
 # issue here by effectively doing the fallback to the cpp-httplib
 # subproject without using meson dependency's "fallback:" option.
-if host_machine.system() == 'darwin' and get_option('wrap_mode') == 'nofallback'
+# Note: Have to do the same thing on Linux too, so "linuxbrew"
+# (homebrew on Linux) works.
+if (host_machine.system() == 'darwin' or host_machine.system() == 'linux')  and get_option('wrap_mode') == 'nofallback'
     cpp_httplib_dep = dependency('cpp-httplib', required: false)
     if not cpp_httplib_dep.found()
         cpp_httplib_dep = subproject('cpp-httplib').get_variable('cpp_httplib_dep')

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-0.4.25.20241217
+0.4.26.20241222