*Update Meson to 0.47.1. (microsoft#4155)

*Fix acquire meson on Unix platforms.
DavidLudwig · Aug 30, 2018 · e9f36a0 · e9f36a0
1 parent 4b4aac0
commit e9f36a0
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake
@@ -128,11 +128,17 @@ function(vcpkg_find_acquire_program VAR)
   elseif(VAR MATCHES "MESON")
     set(PROGNAME meson)
     set(REQUIRED_INTERPRETER PYTHON3)
-    set(SCRIPTNAME meson.py)
-    set(PATHS ${DOWNLOADS}/tools/meson/meson-0.43.0)
-    set(URL "https://github.com/mesonbuild/meson/archive/0.43.0.zip")
-    set(ARCHIVE "meson-0.43.0.zip")
-    set(HASH dde4de72eff37046731224f32aa5f4618d45bdf148cec2d1af6e25e7522ebc2b04aedc9eceed483dfa93823a0ea7ea472d0c0c9380061bf3ee2f16b87dd1425e)
+    set(BREW_PACKAGE_NAME "meson")
+    set(APT_PACKAGE_NAME "meson")
+    if(CMAKE_HOST_WIN32)
+      set(SCRIPTNAME meson.py)
+    else()
+      set(SCRIPTNAME meson)
+    endif()
+    set(PATHS ${DOWNLOADS}/tools/meson/meson-0.47.1)
+    set(URL "https://github.com/mesonbuild/meson/archive/0.47.1.zip")
+    set(ARCHIVE "meson-0.47.1.zip")
+    set(HASH 0f6462835583a51707bee82d852018cfcb7444c0dad95b2ba08814e500a5cfe3f731dc6c1fb73c765d1120ee2a2d6600e15d8d393bab1993e84bd4354b2e6855)
   elseif(VAR MATCHES "FLEX")
   if(CMAKE_HOST_WIN32)
     set(PROGNAME win_flex)