Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/grdowns/4802

5 files changed, 39 insertions, 26 deletions

diff --git a/scripts/cmake/vcpkg_acquire_msys.cmake b/scripts/cmake/vcpkg_acquire_msys.cmake
index ed4f7ac29..adbd58ca5 100644
--- a/scripts/cmake/vcpkg_acquire_msys.cmake
+++ b/scripts/cmake/vcpkg_acquire_msys.cmake
@@ -53,20 +53,18 @@ function(vcpkg_acquire_msys PATH_TO_ROOT_OUT)
   if(_vam_HOST_ARCHITECTURE STREQUAL "AMD64")
     set(TOOLSUBPATH msys64)
     set(URLS
-      "http://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-20161025.tar.xz"
-      "https://sourceforge.net/projects/msys2/files/Base/x86_64/msys2-base-x86_64-20161025.tar.xz/download"
+      "http://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-20181211.tar.xz"
     )
-    set(ARCHIVE "msys2-base-x86_64-20161025.tar.xz")
-    set(HASH 6c4c18ec59db80b8269698d074866438a624f1ce735ee5005a01b148b02e8f2e966ae381aa1cb4c50f6226c3b7feb271e36907cf26580df084d695b3c9f5c0eb)
+    set(ARCHIVE "msys2-base-x86_64-20181211.tar.xz")
+    set(HASH 1efb9a7ff1daa2d3147ac0fda8e9a645696dbd19a33c986b844bc037d946dddb3353db5a52794ac668718812854400d918e4db13b4a2d0e6f5a9dfe716b48056)
     set(STAMP "initialized-msys2_64.stamp")
   else()
     set(TOOLSUBPATH msys32)
     set(URLS
-      "http://repo.msys2.org/distrib/i686/msys2-base-i686-20161025.tar.xz"
-      "https://sourceforge.net/projects/msys2/files/Base/i686/msys2-base-i686-20161025.tar.xz/download"
+      "http://repo.msys2.org/distrib/i686/msys2-base-i686-20181211.tar.xz"
     )
-    set(ARCHIVE "msys2-base-i686-20161025.tar.xz")
-    set(HASH c9260a38e0c6bf963adeaea098c4e376449c1dd0afe07480741d6583a1ac4c138951ccb0c5388bd148e04255a5c1a23bf5ee2d58dcd6607c14f1eaa5639a7c85)
+    set(ARCHIVE "msys2-base-i686-20181211.tar.xz")
+    set(HASH a9b9680a511bb205b87811b303eb29d62e2fd851000304f8b087c5893a3891c2aa2d46217ae989e31b5d52a6ba34ac5e6a5e624d9c917df00a752ade4debc20f)
     set(STAMP "initialized-msys2_32.stamp")
   endif()
 
diff --git a/scripts/cmake/vcpkg_build_qmake.cmake b/scripts/cmake/vcpkg_build_qmake.cmake
index 189a1113b..947178686 100644
--- a/scripts/cmake/vcpkg_build_qmake.cmake
+++ b/scripts/cmake/vcpkg_build_qmake.cmake
@@ -51,7 +51,7 @@ function(vcpkg_build_qmake)
             file(READ "${DEBUG_MAKEFILE}" _contents)
             string(REPLACE "zlib.lib" "zlibd.lib" _contents "${_contents}")
             string(REPLACE "installed\\${TARGET_TRIPLET}\\lib" "installed\\${TARGET_TRIPLET}\\debug\\lib" _contents "${_contents}")
-            string(REPLACE "/LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib qtmaind.lib" "shell32.lib /LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib\\manual-link qtmaind.lib /LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib" _contents "${_contents}")
+            string(REPLACE "/LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib" "/LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib\\manual-link /LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib shell32.lib" _contents "${_contents}")
             string(REPLACE "tools\\qt5\\qmlcachegen.exe" "tools\\qt5-declarative\\qmlcachegen.exe" _contents "${_contents}")
             string(REPLACE "tools/qt5/qmlcachegen" "tools/qt5-declarative/qmlcachegen" _contents "${_contents}")
             string(REPLACE "debug\\lib\\Qt5Bootstrap.lib" "tools\\qt5\\Qt5Bootstrap.lib" _contents "${_contents}")
@@ -72,7 +72,7 @@ function(vcpkg_build_qmake)
 
         foreach(RELEASE_MAKEFILE ${RELEASE_MAKEFILES})
             file(READ "${RELEASE_MAKEFILE}" _contents)
-            string(REPLACE "/LIBPATH:${NATIVE_INSTALLED_DIR}\\lib qtmain.lib" "shell32.lib /LIBPATH:${NATIVE_INSTALLED_DIR}\\lib\\manual-link qtmain.lib /LIBPATH:${NATIVE_INSTALLED_DIR}\\lib" _contents "${_contents}")
+            string(REPLACE "/LIBPATH:${NATIVE_INSTALLED_DIR}\\lib" "/LIBPATH:${NATIVE_INSTALLED_DIR}\\lib\\manual-link /LIBPATH:${NATIVE_INSTALLED_DIR}\\lib shell32.lib" _contents "${_contents}")
             string(REPLACE "tools\\qt5\\qmlcachegen.exe" "tools\\qt5-declarative\\qmlcachegen.exe" _contents "${_contents}")
             string(REPLACE "tools/qt5/qmlcachegen" "tools/qt5-declarative/qmlcachegen" _contents "${_contents}")
             string(REPLACE "debug\\lib\\Qt5Bootstrap.lib" "tools\\qt5\\Qt5Bootstrap.lib" _contents "${_contents}")
diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake
index 617fe1a0f..f7b81de93 100644
--- a/scripts/cmake/vcpkg_configure_cmake.cmake
+++ b/scripts/cmake/vcpkg_configure_cmake.cmake
@@ -77,9 +77,6 @@ function(vcpkg_configure_cmake)
     elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
         # Ninja and MSBuild have many differences when targetting UWP, so use MSBuild to maximize existing compatibility
         set(NINJA_CAN_BE_USED OFF)
-    elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
-        # Arm64 usage should be allowed once github issue #2375 is resolved
-        set(NINJA_CAN_BE_USED OFF)
     endif()
 
     if(_csc_GENERATOR)
@@ -170,6 +167,8 @@ function(vcpkg_configure_cmake)
         list(APPEND _csc_OPTIONS "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_ROOT_DIR}/scripts/toolchains/android.cmake")
     elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
         list(APPEND _csc_OPTIONS "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_ROOT_DIR}/scripts/toolchains/osx.cmake")
+    elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+        list(APPEND _csc_OPTIONS "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_ROOT_DIR}/scripts/toolchains/freebsd.cmake")
     endif()
 
     list(APPEND _csc_OPTIONS
diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake
index 1ff2ab071..1f856b69e 100644
--- a/scripts/cmake/vcpkg_find_acquire_program.cmake
+++ b/scripts/cmake/vcpkg_find_acquire_program.cmake
@@ -58,15 +58,12 @@ function(vcpkg_find_acquire_program VAR)
     set(HASH a6e685ea24376f50db5f06c5b46075f1d3be25168fa1f27fa9b02e2ac017826cee62a2b43562f9b6c989337a231ba914416c110075457764de2d11f99d5e0f26)
   elseif(VAR MATCHES "NASM")
     set(PROGNAME nasm)
-    set(PATHS ${DOWNLOADS}/tools/nasm/nasm-2.12.02)
+    set(PATHS ${DOWNLOADS}/tools/nasm/nasm-2.14)
     set(BREW_PACKAGE_NAME "nasm")
     set(APT_PACKAGE_NAME "nasm")
-    set(URL
-      "http://www.nasm.us/pub/nasm/releasebuilds/2.12.02/win32/nasm-2.12.02-win32.zip"
-      "http://mirrors.kodi.tv/build-deps/win32/nasm-2.12.02-win32.zip"
-    )
-    set(ARCHIVE "nasm-2.12.02-win32.zip")
-    set(HASH df7aaba094e17832688c88993997612a2e2c96cc3dc14ca3e8347b44c7762115f5a7fc6d7f20be402553aaa4c9e43ddfcf6228f581cfe89289bae550de151b36)
+    set(URL "http://www.nasm.us/pub/nasm/releasebuilds/2.14/win32/nasm-2.14-win32.zip")
+    set(ARCHIVE "nasm-2.14-win32.zip")
+    set(HASH 64481b0346b83de8c9568f04a54f68e0f4c71724afa0b414f12e4080951d8c49e489bfc32117f9a489e3e49477b1cadc583c672311316d27c543af304c4b7f2a)
   elseif(VAR MATCHES "YASM")
     set(PROGNAME yasm)
     set(SUBDIR 1.3.0.6)
@@ -77,12 +74,18 @@ function(vcpkg_find_acquire_program VAR)
     set(NOEXTRACT ON)
     set(HASH c1945669d983b632a10c5ff31e86d6ecbff143c3d8b2c433c0d3d18f84356d2b351f71ac05fd44e5403651b00c31db0d14615d7f9a6ecce5750438d37105c55b)
   elseif(VAR MATCHES "PYTHON3")
-    set(PROGNAME python)
-    set(SUBDIR "python3")
-    set(PATHS ${DOWNLOADS}/tools/python/${SUBDIR})
-    set(URL "https://www.python.org/ftp/python/3.5.4/python-3.5.4-embed-win32.zip")
-    set(ARCHIVE "python-3.5.4-embed-win32.zip")
-    set(HASH b5240fdc95088c2d7f65d2dd598650f8dd106b49589d94156bd4a078b108c6cabbe7a38ef73e2b2cf00e8312a93d2e587eac2c54ce85540d3c7a26cc60013156)
+    if(CMAKE_HOST_WIN32)
+      set(PROGNAME python)
+      set(SUBDIR "python3")
+      set(PATHS ${DOWNLOADS}/tools/python/${SUBDIR})
+      set(URL "https://www.python.org/ftp/python/3.5.4/python-3.5.4-embed-win32.zip")
+      set(ARCHIVE "python-3.5.4-embed-win32.zip")
+      set(HASH b5240fdc95088c2d7f65d2dd598650f8dd106b49589d94156bd4a078b108c6cabbe7a38ef73e2b2cf00e8312a93d2e587eac2c54ce85540d3c7a26cc60013156)
+    else()
+      set(PROGNAME python3)
+      set(BREW_PACKAGE_NAME "python")
+      set(APT_PACKAGE_NAME "python3")
+    endif()
   elseif(VAR MATCHES "PYTHON2")
     set(PROGNAME python)
     set(SUBDIR "python2")
@@ -117,6 +120,8 @@ function(vcpkg_find_acquire_program VAR)
       set(PATHS "${DOWNLOADS}/tools/ninja/${SUBDIR}")
     elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
       set(PATHS "${DOWNLOADS}/tools/${SUBDIR}-osx")
+    elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD")
+      set(PATHS "${DOWNLOADS}/tools/${SUBDIR}-freebsd")
     else()
       set(PATHS "${DOWNLOADS}/tools/${SUBDIR}-linux")
     endif()
@@ -147,6 +152,9 @@ function(vcpkg_find_acquire_program VAR)
       set(URL "https://sourceforge.net/projects/winflexbison/files/winflexbison-2.5.16.zip/download")
       set(ARCHIVE "win_flex_bison-2.5.16.zip")
       set(HASH 0a14154bff5d998feb23903c46961528f8ccb4464375d5384db8c4a7d230c0c599da9b68e7a32f3217a0a0735742242eaf3769cb4f03e00931af8640250e9123)
+      if(NOT EXISTS "${PATHS}/data/m4sugar/m4sugar.m4")
+        file(REMOVE_RECURSE "${PATHS}")
+      endif()
     else()
       set(PROGNAME flex)
       set(APT_PACKAGE_NAME flex)
@@ -160,6 +168,9 @@ function(vcpkg_find_acquire_program VAR)
       set(URL "https://sourceforge.net/projects/winflexbison/files/winflexbison-2.5.16.zip/download")
       set(ARCHIVE "win_flex_bison-2.5.16.zip")
       set(HASH 0a14154bff5d998feb23903c46961528f8ccb4464375d5384db8c4a7d230c0c599da9b68e7a32f3217a0a0735742242eaf3769cb4f03e00931af8640250e9123)
+      if(NOT EXISTS "${PATHS}/data/m4sugar/m4sugar.m4")
+        file(REMOVE_RECURSE "${PATHS}")
+      endif()
     else()
       set(PROGNAME bison)
       set(APT_PACKAGE_NAME bison)
diff --git a/scripts/cmake/vcpkg_test_cmake.cmake b/scripts/cmake/vcpkg_test_cmake.cmake
index 718b2f69c..29654346a 100644
--- a/scripts/cmake/vcpkg_test_cmake.cmake
+++ b/scripts/cmake/vcpkg_test_cmake.cmake
@@ -27,6 +27,11 @@ function(vcpkg_test_cmake)
       set(PACKAGE_TYPE CONFIG)
     endif()
 
+    if(VCPKG_PLATFORM_TOOLSET STREQUAL "v142")
+      message(STATUS "Skipping CMake integration test due to v142 / CMake interaction issues")
+      return()
+    endif()
+
     message(STATUS "Performing CMake integration test")
     file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-test)
     file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-test)