Merge branch 'master' into default_triplet

# Conflicts:
#	toolsrc/include/vcpkg_cmd_arguments.h
#	toolsrc/src/commands_installation.cpp
#	toolsrc/src/vcpkg_cmd_arguments.cpp

50 files changed, 534 insertions, 96 deletions

diff --git a/ports/boost/portfile.cmake b/ports/boost/portfile.cmake
index 1b9e00561..89839d549 100644
--- a/ports/boost/portfile.cmake
+++ b/ports/boost/portfile.cmake
@@ -2,7 +2,7 @@ include(vcpkg_common_functions)
 vcpkg_download_distfile(ARCHIVE_FILE
     URL "http://sourceforge.net/projects/boost/files/boost/1.61.0/boost_1_61_0.tar.bz2"
     FILENAME "boost_1_61_0.tar.bz2"
-    MD5 6095876341956f65f9d35939ccea1a9f
+    SHA512 a1c7338e2d2dbac8552ede7c554640d22cbb2fda7fbc325dc3cdcb51e769713626695426ffc158cbe0e1729dd9a7b5ad18af4800d74e24539e8d8564268c2b9d
 )
 vcpkg_extract_source_archive(${ARCHIVE_FILE})
 
diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake
index fc1115741..a4ea250c0 100644
--- a/ports/curl/portfile.cmake
+++ b/ports/curl/portfile.cmake
@@ -2,7 +2,7 @@ include(vcpkg_common_functions)
 vcpkg_download_distfile(ARCHIVE_FILE
     URL "https://curl.haxx.se/download/curl-7.48.0.tar.bz2"
     FILENAME "curl-7.48.0.tar.bz2"
-    MD5 d42e0fc34a5cace5739631cc040974fe
+    SHA512 9bb554eaf4ccaced0fa9b38de4f381eab84b96c1aa07a45d83ddfd38a925044d0fe9fac517263f67f009d2294a31c33dedb2267defbab0cb14f96091bbed5f92
 )
 vcpkg_extract_source_archive(${ARCHIVE_FILE})
 
diff --git a/ports/doctest/CONTROL b/ports/doctest/CONTROL
new file mode 100644
index 000000000..df41ef19f
--- /dev/null
+++ b/ports/doctest/CONTROL
@@ -0,0 +1,3 @@
+Source: doctest
+Version: 1.1.0
+Description: The lightest feature-rich C++ single-header testing framework for unit tests and TDD
diff --git a/ports/doctest/portfile.cmake b/ports/doctest/portfile.cmake
new file mode 100644
index 000000000..46a3abe71
--- /dev/null
+++ b/ports/doctest/portfile.cmake
@@ -0,0 +1,13 @@
+include(vcpkg_common_functions)
+vcpkg_download_distfile(ARCHIVE
+    URL "https://github.com/onqtam/doctest/archive/1.1.0.zip"
+    FILENAME "doctest-1.1.0.zip"
+    SHA512 3cbdbb82d2dceff5a34aaed45222832c5767f21b64b271c41c2da7bae1f9e364a60758a8b6ce64285999afc30dd76de980e287663fa3119d0bcc1d2b45514e0b
+)
+vcpkg_extract_source_archive(${ARCHIVE})
+
+# Handle copyright
+file(INSTALL ${CURRENT_BUILDTREES_DIR}/src/doctest-1.1.0/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/doctest RENAME copyright)
+
+# Copy header file
+file(INSTALL ${CURRENT_BUILDTREES_DIR}/src/doctest-1.1.0/doctest/doctest.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/doctest)
diff --git a/ports/eigen3/portfile.cmake b/ports/eigen3/portfile.cmake
index 54e9c0c5a..921058803 100644
--- a/ports/eigen3/portfile.cmake
+++ b/ports/eigen3/portfile.cmake
@@ -2,7 +2,7 @@ include(vcpkg_common_functions)
 vcpkg_download_distfile(ARCHIVE
     URL "http://bitbucket.org/eigen/eigen/get/3.2.9.tar.bz2"
     FILENAME "eigen-3.2.9.tar.bz2"
-    MD5 de11bfbfe2fd2dc4b32e8f416f58ee98
+    SHA512 2734ce70e0b04dc5839715a3cc9b8f90e05b341cfca42a7d586df213a9a14fe5642c76ccf36c16d020ae167c0d6e4d5cc306f0b3bf1f519c58372b0736ca7e63
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
diff --git a/ports/expat/portfile.cmake b/ports/expat/portfile.cmake
index 9a396774d..e0f0d06e0 100644
--- a/ports/expat/portfile.cmake
+++ b/ports/expat/portfile.cmake
@@ -2,7 +2,7 @@ include(vcpkg_common_functions)
 vcpkg_download_distfile(ARCHIVE_FILE
     URL "http://downloads.sourceforge.net/project/expat/expat/2.1.1/expat-2.1.1.tar.bz2"
     FILENAME "expat-2.1.1.tar.bz2"
-    MD5 7380a64a8e3a9d66a9887b01d0d7ea81
+    SHA512 088e2ef3434f2affd4fc79fe46f0e9826b9b4c3931ddc780cd18892f1cd1e11365169c6807f45916a56bb6abcc627dcd17a23f970be0bf464f048f5be2713628
 )
 vcpkg_extract_source_archive(${ARCHIVE_FILE})
 
diff --git a/ports/fmt/portfile.cmake b/ports/fmt/portfile.cmake
index 9cf5ed4be..74cdd60be 100644
--- a/ports/fmt/portfile.cmake
+++ b/ports/fmt/portfile.cmake
@@ -3,7 +3,7 @@ include(vcpkg_common_functions)
 vcpkg_download_distfile(ARCHIVE_FILE
     URL "https://github.com/fmtlib/fmt/archive/3.0.0.tar.gz"
     FILENAME "fmt-3.0.0.tar.gz"
-    MD5 deeac02aa6d00d6d04502087fdf88b6f
+    SHA512 20c9b1ffe8b46cb5d22015122fc698a75ad854709d3de1a1316b6040d86f54bada4e6d7263f2f1fd94cb13ac37ee9447c162c6aec3f3af650455e8a8a9804871
 )
 vcpkg_extract_source_archive(${ARCHIVE_FILE})
 
diff --git a/ports/freetype/portfile.cmake b/ports/freetype/portfile.cmake
index 641d2e5f9..750f1a9e4 100644
--- a/ports/freetype/portfile.cmake
+++ b/ports/freetype/portfile.cmake
@@ -2,7 +2,7 @@ include(vcpkg_common_functions)
 vcpkg_download_distfile(ARCHIVE
     URL "http://download.savannah.gnu.org/releases/freetype/freetype-2.6.3.tar.bz2"
     FILENAME "freetype-2.6.3.tar.bz2"
-    MD5 0037b25a8c090bc8a1218e867b32beb1
+    SHA512 e1f9018835fc88beeb4479537b59f866c52393ae18d24a1e0710a464cf948ab02b35c2c6043bc20c1db3a04871ee4eb0bb1d210550c0ea2780c8b1aea98fbf0d
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
diff --git a/ports/glew/portfile.cmake b/ports/glew/portfile.cmake
index 320db8043..273d7041b 100644
--- a/ports/glew/portfile.cmake
+++ b/ports/glew/portfile.cmake
@@ -2,10 +2,19 @@ include(vcpkg_common_functions)
 vcpkg_download_distfile(ARCHIVE_FILE
     URL "http://downloads.sourceforge.net/project/glew/glew/1.13.0/glew-1.13.0.tgz"
     FILENAME "glew-1.13.0.tgz"
-    MD5 7cbada3166d2aadfc4169c4283701066
+    SHA512 8fc8d7c0d2cd9235ea51db9972f492701827bff40642fdb3cc54c10b0737dba8e6d8d0dcd8c5aa5bfaaae39c6198ba3d4292cd1662fbe1977eb9a5d187ba635f
 )
 vcpkg_extract_source_archive(${ARCHIVE_FILE})
 
+IF (TRIPLET_SYSTEM_ARCH MATCHES "x86")
+	SET(BUILD_ARCH "Win32")
+ELSEIF(TRIPLET_SYSTEM_ARCH MATCHES "arm")
+	MESSAGE(FATAL_ERROR, " ARM is currently not supported.")
+	RETURN()
+ELSE()
+	SET(BUILD_ARCH ${TRIPLET_SYSTEM_ARCH})
+ENDIF()
+
 if(NOT EXISTS ${CURRENT_BUILDTREES_DIR}/src/glew-1.13.0/build/vc12/glew_shared14.vcxproj)
     message(STATUS "Upgrading projects")
     file(READ ${CURRENT_BUILDTREES_DIR}/src/glew-1.13.0/build/vc12/glew_shared.vcxproj PROJ)
@@ -26,22 +35,23 @@ vcpkg_build_msbuild(
 )
 
 message(STATUS "Installing")
+
 file(INSTALL
-    ${CURRENT_BUILDTREES_DIR}/src/glew-1.13.0/bin/Debug/Win32/glew32d.dll
-    ${CURRENT_BUILDTREES_DIR}/src/glew-1.13.0/bin/Debug/Win32/glew32d.pdb
+    ${CURRENT_BUILDTREES_DIR}/src/glew-1.13.0/bin/Debug/${BUILD_ARCH}/glew32d.dll
+    ${CURRENT_BUILDTREES_DIR}/src/glew-1.13.0/bin/Debug/${BUILD_ARCH}/glew32d.pdb
     DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin
 )
 file(INSTALL
-    ${CURRENT_BUILDTREES_DIR}/src/glew-1.13.0/bin/Release/Win32/glew32.dll
-    ${CURRENT_BUILDTREES_DIR}/src/glew-1.13.0/bin/Release/Win32/glew32.pdb
+    ${CURRENT_BUILDTREES_DIR}/src/glew-1.13.0/bin/Release/${BUILD_ARCH}/glew32.dll
+    ${CURRENT_BUILDTREES_DIR}/src/glew-1.13.0/bin/Release/${BUILD_ARCH}/glew32.pdb
     DESTINATION ${CURRENT_PACKAGES_DIR}/bin
 )
 file(INSTALL
-    ${CURRENT_BUILDTREES_DIR}/src/glew-1.13.0/lib/Debug/Win32/glew32d.lib
+    ${CURRENT_BUILDTREES_DIR}/src/glew-1.13.0/lib/Debug/${BUILD_ARCH}/glew32d.lib
     DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
 )
 file(INSTALL
-    ${CURRENT_BUILDTREES_DIR}/src/glew-1.13.0/lib/Release/Win32/glew32.lib
+    ${CURRENT_BUILDTREES_DIR}/src/glew-1.13.0/lib/Release/${BUILD_ARCH}/glew32.lib
     DESTINATION ${CURRENT_PACKAGES_DIR}/lib
 )
 file(INSTALL
diff --git a/ports/glfw3/portfile.cmake b/ports/glfw3/portfile.cmake
index cbfa6134d..25438b420 100644
--- a/ports/glfw3/portfile.cmake
+++ b/ports/glfw3/portfile.cmake
@@ -2,7 +2,7 @@ include(vcpkg_common_functions)
 vcpkg_download_distfile(ARCHIVE
     URL "https://github.com/glfw/glfw/releases/download/3.1.2/glfw-3.1.2.zip"
     FILENAME "glfw-3.1.2.zip"
-    MD5 8023327bfe979b3fe735e449e2f54842
+    SHA512 c199137b32182182123869fe69ab991a296feb80dcf3db3cf5e070cdaef31ed958148d9b87e724c1937fa535960122bdceb92ea9dd38f7ef41e4e08e36210fe5
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
diff --git a/ports/glm/portfile.cmake b/ports/glm/portfile.cmake
index 0d4d08a6d..63540f95d 100644
--- a/ports/glm/portfile.cmake
+++ b/ports/glm/portfile.cmake
@@ -2,7 +2,7 @@ include(vcpkg_common_functions)
 vcpkg_download_distfile(ARCHIVE
     URL "https://github.com/g-truc/glm/releases/download/0.9.8.0/glm-0.9.8.0.zip"
     FILENAME "glm-0.9.8.0.zip"
-    MD5 b24613c1f7e16f504d936ae3ac1f4917
+    SHA512 5fe9d1f582e7bbef37fd23c9d10fd9cf7696bb7c6f8086a250248e97f84b0205a89a195c8838a1ddc4c0a4cb4c69d1764f90db6513a9691a94877b7ec6b2befb
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
diff --git a/ports/gsl/portfile.cmake b/ports/gsl/portfile.cmake
index 5cf05c985..53d5556d6 100644
--- a/ports/gsl/portfile.cmake
+++ b/ports/gsl/portfile.cmake
@@ -2,7 +2,7 @@ include(vcpkg_common_functions)
 vcpkg_download_distfile(ARCHIVE
     URL "https://github.com/Microsoft/GSL/archive/fd5ad87bf25cb5e87104ee58106dee9bc809cd93.zip"
     FILENAME "gsl-fd5ad87bf.zip"
-    MD5 30935befb50eb3742131ad1056d2d498
+    SHA512 81887be57e12bfc4e67353713478e1638bf1bffb8f523cf7241acf5415c2e3fe82ea0c0128380dcb2008afb5f53ac0d4893660626a8cd1eb501da536e6af5692
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
diff --git a/ports/gtest/0001-Enable-C-11-features-for-VS2015-fix-appveyor-fail.patch b/ports/gtest/0001-Enable-C-11-features-for-VS2015-fix-appveyor-fail.patch
new file mode 100644
index 000000000..274942482
--- /dev/null
+++ b/ports/gtest/0001-Enable-C-11-features-for-VS2015-fix-appveyor-fail.patch
@@ -0,0 +1,177 @@
+From 1695708beda0306f3b4dffd66f4be142425894a0 Mon Sep 17 00:00:00 2001
+From: Arkady Shapkin <arkady.shapkin@gmail.com>
+Date: Wed, 2 Mar 2016 02:53:10 +0300
+Subject: [PATCH] Enable C++11 features for VS2015 (fix appveyor fail)
+
+---
+ .gitignore                                      | 13 ++++++++
+ googlemock/test/gmock-matchers_test.cc          |  5 +++
+ googletest/include/gtest/internal/gtest-port.h  | 10 ++++--
+ googletest/test/gtest-printers_test.cc          | 43 ++++++++++++++++++++++---
+ googletest/test/gtest_catch_exceptions_test_.cc |  2 +-
+ 5 files changed, 64 insertions(+), 9 deletions(-)
+
+diff --git a/.gitignore b/.gitignore
+index ce310bc..08a67cd 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -1,2 +1,15 @@
+ # Ignore CI build directory
+ build/
++_build/
++
++# Visual Studio files
++*.sdf
++*.opensdf
++*.VC.opendb
++*.suo
++*.user
++_ReSharper.Caches/
++Win32-Debug/
++Win32-Release/
++x64-Debug/
++x64-Release/
+diff --git a/googlemock/test/gmock-matchers_test.cc b/googlemock/test/gmock-matchers_test.cc
+index 9f62c3d..eaba362 100644
+--- a/googlemock/test/gmock-matchers_test.cc
++++ b/googlemock/test/gmock-matchers_test.cc
+@@ -58,6 +58,11 @@
+ # include <forward_list>  // NOLINT
+ #endif
+ 
++// Disable MSVC warning: "decorated name length exceeded, name was truncated".
++#ifdef _MSC_VER
++# pragma warning(disable:4503)
++#endif
++
+ namespace testing {
+ 
+ namespace internal {
+diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h
+index 0094ed5..c07c455 100644
+--- a/googletest/include/gtest/internal/gtest-port.h
++++ b/googletest/include/gtest/internal/gtest-port.h
+@@ -323,7 +323,7 @@
+ // -std={c,gnu}++{0x,11} is passed.  The C++11 standard specifies a
+ // value for __cplusplus, and recent versions of clang, gcc, and
+ // probably other compilers set that too in C++11 mode.
+-# if __GXX_EXPERIMENTAL_CXX0X__ || __cplusplus >= 201103L
++# if __GXX_EXPERIMENTAL_CXX0X__ || __cplusplus >= 201103L || _MSC_VER >= 1900
+ // Compiling in at least C++11 mode.
+ #  define GTEST_LANG_CXX11 1
+ # else
+@@ -355,12 +355,16 @@
+ #if GTEST_STDLIB_CXX11
+ # define GTEST_HAS_STD_BEGIN_AND_END_ 1
+ # define GTEST_HAS_STD_FORWARD_LIST_ 1
+-# define GTEST_HAS_STD_FUNCTION_ 1
++# if !defined(_MSC_VER) || (_MSC_FULL_VER >= 190023824) // works only with VS2015U2 and better
++#   define GTEST_HAS_STD_FUNCTION_ 1
++# endif
+ # define GTEST_HAS_STD_INITIALIZER_LIST_ 1
+ # define GTEST_HAS_STD_MOVE_ 1
+ # define GTEST_HAS_STD_SHARED_PTR_ 1
+ # define GTEST_HAS_STD_TYPE_TRAITS_ 1
+ # define GTEST_HAS_STD_UNIQUE_PTR_ 1
++# define GTEST_HAS_UNORDERED_MAP_ 1
++# define GTEST_HAS_UNORDERED_SET_ 1
+ #endif
+ 
+ // C++11 specifies that <tuple> provides std::tuple.
+@@ -616,7 +620,7 @@ struct _RTL_CRITICAL_SECTION;
+ // Determines if hash_map/hash_set are available.
+ // Only used for testing against those containers.
+ #if !defined(GTEST_HAS_HASH_MAP_)
+-# if _MSC_VER
++# if defined(_MSC_VER) && (_MSC_VER < 1900)
+ #  define GTEST_HAS_HASH_MAP_ 1  // Indicates that hash_map is available.
+ #  define GTEST_HAS_HASH_SET_ 1  // Indicates that hash_set is available.
+ # endif  // _MSC_VER
+diff --git a/googletest/test/gtest-printers_test.cc b/googletest/test/gtest-printers_test.cc
+index 3e97cc2..6320563 100644
+--- a/googletest/test/gtest-printers_test.cc
++++ b/googletest/test/gtest-printers_test.cc
+@@ -51,10 +51,15 @@
+ #include "gtest/gtest.h"
+ 
+ // hash_map and hash_set are available under Visual C++, or on Linux.
+-#if GTEST_HAS_HASH_MAP_
++#if GTEST_HAS_UNORDERED_MAP_
++# include <unordered_map>       // NOLINT
++#elif GTEST_HAS_HASH_MAP_
+ # include <hash_map>            // NOLINT
+ #endif  // GTEST_HAS_HASH_MAP_
+-#if GTEST_HAS_HASH_SET_
++
++#if GTEST_HAS_UNORDERED_SET_
++# include <unordered_set>       // NOLINT
++#elif GTEST_HAS_HASH_SET_
+ # include <hash_set>            // NOLINT
+ #endif  // GTEST_HAS_HASH_SET_
+ 
+@@ -217,18 +222,46 @@ using ::testing::internal::string;
+ // The hash_* classes are not part of the C++ standard.  STLport
+ // defines them in namespace std.  MSVC defines them in ::stdext.  GCC
+ // defines them in ::.
++#if GTEST_HAS_UNORDERED_MAP_
++
++#define GTEST_HAS_HASH_MAP_ 1
++template<class Key, class T>
++using hash_map = ::std::unordered_map<Key, T>;
++template<class Key, class T>
++using hash_multimap = ::std::unordered_multimap<Key, T>;
++
++#elif GTEST_HAS_HASH_MAP_
++
+ #ifdef _STLP_HASH_MAP  // We got <hash_map> from STLport.
+ using ::std::hash_map;
+-using ::std::hash_set;
+ using ::std::hash_multimap;
+-using ::std::hash_multiset;
+ #elif _MSC_VER
+ using ::stdext::hash_map;
+-using ::stdext::hash_set;
+ using ::stdext::hash_multimap;
++#endif
++
++#endif
++
++#if GTEST_HAS_UNORDERED_SET_
++
++#define GTEST_HAS_HASH_SET_ 1
++template<class Key>
++using hash_set = ::std::unordered_set<Key>;
++template<class Key>
++using hash_multiset = ::std::unordered_multiset<Key>;
++
++#elif GTEST_HAS_HASH_SET_
++
++#ifdef _STLP_HASH_MAP  // We got <hash_map> from STLport.
++using ::std::hash_set;
++using ::std::hash_multiset;
++#elif _MSC_VER
++using ::stdext::hash_set;
+ using ::stdext::hash_multiset;
+ #endif
+ 
++#endif
++
+ // Prints a value to a string using the universal value printer.  This
+ // is a helper for testing UniversalPrinter<T>::Print() for various types.
+ template <typename T>
+diff --git a/googletest/test/gtest_catch_exceptions_test_.cc b/googletest/test/gtest_catch_exceptions_test_.cc
+index d0fc82c..c6d953c 100644
+--- a/googletest/test/gtest_catch_exceptions_test_.cc
++++ b/googletest/test/gtest_catch_exceptions_test_.cc
+@@ -138,7 +138,7 @@ TEST_F(CxxExceptionInConstructorTest, ThrowsExceptionInConstructor) {
+ }
+ 
+ // Exceptions in destructors are not supported in C++11.
+-#if !defined(__GXX_EXPERIMENTAL_CXX0X__) &&  __cplusplus < 201103L
++#if !GTEST_LANG_CXX11
+ class CxxExceptionInDestructorTest : public Test {
+  public:
+   static void TearDownTestCase() {
+-- 
+2.10.0.windows.1
+
diff --git a/ports/gtest/CONTROL b/ports/gtest/CONTROL
new file mode 100644
index 000000000..07336b978
--- /dev/null
+++ b/ports/gtest/CONTROL
@@ -0,0 +1,3 @@
+Source: gtest
+Version: 1.8
+Description: GoogleTest and GoogleMock testing frameworks.
\ No newline at end of file
diff --git a/ports/gtest/portfile.cmake b/ports/gtest/portfile.cmake
new file mode 100644
index 000000000..bfac8ab61
--- /dev/null
+++ b/ports/gtest/portfile.cmake
@@ -0,0 +1,56 @@
+include(vcpkg_common_functions)
+
+find_program(GIT git)
+
+set(GIT_URL "https://github.com/google/googletest.git")
+set(GIT_TAG "release-1.8.0")
+
+if(NOT EXISTS "${DOWNLOADS}/googletest.git")
+    message(STATUS "Cloning")
+    vcpkg_execute_required_process(
+        COMMAND ${GIT} clone --bare ${GIT_URL} ${DOWNLOADS}/googletest.git
+        WORKING_DIRECTORY ${DOWNLOADS}
+        LOGNAME clone
+    )
+endif()
+message(STATUS "Cloning done")
+
+if(NOT EXISTS "${CURRENT_BUILDTREES_DIR}/src/.git")
+    message(STATUS "Adding worktree and patching")
+    vcpkg_execute_required_process(
+        COMMAND ${GIT} worktree add -f --detach ${CURRENT_BUILDTREES_DIR}/src ${GIT_TAG}
+        WORKING_DIRECTORY ${DOWNLOADS}/googletest.git
+        LOGNAME worktree
+    )
+    message(STATUS "Patching")
+    vcpkg_execute_required_process(
+        COMMAND ${GIT} am ${CMAKE_CURRENT_LIST_DIR}/0001-Enable-C-11-features-for-VS2015-fix-appveyor-fail.patch --ignore-whitespace --whitespace=fix
+        WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/src
+        LOGNAME patch
+    )
+endif()
+message(STATUS "Adding worktree and patching done")
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src
+    OPTIONS
+        -DBUILD_SHARED_LIBS=ON
+)
+
+vcpkg_build_cmake()
+
+vcpkg_install_cmake()
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(INSTALL ${CURRENT_BUILDTREES_DIR}/src/googletest/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/gtest RENAME copyright)
+file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin/)
+file(RENAME ${CURRENT_PACKAGES_DIR}/lib/gtest.dll ${CURRENT_PACKAGES_DIR}/bin/gtest.dll)
+file(RENAME ${CURRENT_PACKAGES_DIR}/lib/gtest_main.dll ${CURRENT_PACKAGES_DIR}/bin/gtest_main.dll)
+file(RENAME ${CURRENT_PACKAGES_DIR}/lib/gmock.dll ${CURRENT_PACKAGES_DIR}/bin/gmock.dll)
+file(RENAME ${CURRENT_PACKAGES_DIR}/lib/gmock_main.dll ${CURRENT_PACKAGES_DIR}/bin/gmock_main.dll)
+file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin/)
+file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gtest.dll ${CURRENT_PACKAGES_DIR}/debug/bin/gtest.dll)
+file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gtest_main.dll ${CURRENT_PACKAGES_DIR}/debug/bin/gtest_main.dll)
+file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gmock.dll ${CURRENT_PACKAGES_DIR}/debug/bin/gmock.dll)
+file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gmock_main.dll ${CURRENT_PACKAGES_DIR}/debug/bin/gmock_main.dll)
+
+vcpkg_copy_pdbs()
diff --git a/ports/libjpeg-turbo/portfile.cmake b/ports/libjpeg-turbo/portfile.cmake
index 82e5c6ab1..46670d277 100644
--- a/ports/libjpeg-turbo/portfile.cmake
+++ b/ports/libjpeg-turbo/portfile.cmake
@@ -4,7 +4,7 @@ set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libjpeg-turbo-1.4.90)
 vcpkg_download_distfile(ARCHIVE
     URL "https://github.com/libjpeg-turbo/libjpeg-turbo/archive/1.4.90.zip"
     FILENAME "libjpeg-turbo-1.4.90.zip"
-    MD5 dcd49a7100e41870faae988f608471af
+    SHA512 43c3d26c70a7356bb0832276fe82eead040c3f4aa17df118f91a38615bfacfdfb25fab41965f9ca2b69d18e0b937a1bb753e93fa2c114e01d5174fc1100010b4
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 vcpkg_apply_patches(
diff --git a/ports/libpng/portfile.cmake b/ports/libpng/portfile.cmake
index c5aa301bb..f376201f2 100644
--- a/ports/libpng/portfile.cmake
+++ b/ports/libpng/portfile.cmake
@@ -4,7 +4,7 @@ set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libpng-1.6.24)
 vcpkg_download_distfile(ARCHIVE
     URL "http://download.sourceforge.net/libpng/libpng-1.6.24.tar.xz"
     FILENAME "libpng-1.6.24.tar.xz"
-    MD5 ffcdbd549814787fa8010c372e35ff25
+    SHA512 7eccb90f530a9c728e280b2b1776304a808b5deea559632e7bcf4ea219c7cb5e453aa810215465304501127595000717d4b7c5b26a9f8e22e236ec04af53a90f
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 vcpkg_apply_patches(
diff --git a/ports/libuv/portfile.cmake b/ports/libuv/portfile.cmake
index 0a830b8e4..480856cfb 100644
--- a/ports/libuv/portfile.cmake
+++ b/ports/libuv/portfile.cmake
@@ -2,7 +2,7 @@ include(vcpkg_common_functions)
 vcpkg_download_distfile(ARCHIVE
     URL "https://github.com/libuv/libuv/archive/v1.9.1.zip"
     FILENAME "libuv-v1.9.1.zip"
-    MD5 4d1e74197920455203954cd8b75f0a2f
+    SHA512 3eb8711e3612fb3f5a1ddeb4614b2bec29c022ac5c6c2590bc5239825d758a73be0819c52747956a029859ef4e416bf3fce16665bac2c6c4890f736b47c38226
 )
 
 if(NOT EXISTS ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-src)
diff --git a/ports/libwebsockets/portfile.cmake b/ports/libwebsockets/portfile.cmake
index 5aa1e3ff5..ba95019e3 100644
--- a/ports/libwebsockets/portfile.cmake
+++ b/ports/libwebsockets/portfile.cmake
@@ -2,7 +2,7 @@ include(vcpkg_common_functions)
 vcpkg_download_distfile(ARCHIVE
     URL "https://github.com/warmcat/libwebsockets/archive/v2.0.0.zip"
     FILENAME "libwebsockets-v2.0.0.zip"
-    MD5 1947a1887dda5b5f9624048f4b6b1507
+    SHA512 bf57a46f2c60095e7e6ec6656b185ffd2cf8f553bc22255ae8f6825d3613316d794f139cdefacbdf60ef997b0cd675fe356813d406c9b7c5a5ae838ce5326042
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
diff --git a/ports/mpg123/portfile.cmake b/ports/mpg123/portfile.cmake
index d7abb9bf8..f92b26825 100644
--- a/ports/mpg123/portfile.cmake
+++ b/ports/mpg123/portfile.cmake
@@ -2,7 +2,7 @@ include(vcpkg_common_functions)
 vcpkg_download_distfile(ARCHIVE
     URL "http://downloads.sourceforge.net/project/mpg123/mpg123/1.23.3/mpg123-1.23.3.tar.bz2"
     FILENAME "mpg123-1.23.3.tar.bz2"
-    MD5 84e838650c4c593f4e66d1256e0468db
+    SHA512 a5ebfb36223a3966386bc8e5769b8543861872d20f9de037d07857e857000f20e198e0b1db04bdc56b18b19d5b4027d8261a104af0216d6ea45274b21a18dda4
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
diff --git a/ports/mpir/CONTROL b/ports/mpir/CONTROL
new file mode 100644
index 000000000..6d8646f93
--- /dev/null
+++ b/ports/mpir/CONTROL
@@ -0,0 +1,3 @@
+Source: mpir
+Version: 2.7.2
+Description: Multiple Precision Integers and Rationals.
\ No newline at end of file
diff --git a/ports/mpir/portfile.cmake b/ports/mpir/portfile.cmake
new file mode 100644
index 000000000..7e9103ec7
--- /dev/null
+++ b/ports/mpir/portfile.cmake
@@ -0,0 +1,48 @@
+include(vcpkg_common_functions)
+vcpkg_download_distfile(ARCHIVE_FILE
+    URL "http://mpir.org/mpir-2.7.2.tar.lz"
+    FILENAME "mpir-2.7.2.tar.lz"
+    SHA512 2635c167ddbba99364ec741373768e0675d34f94fad8912d5433b95e6fbfdb0510f5e94a707acc42048254bc658c52c6671bb0c0dac31267c4b82b00c3e74efa
+)
+vcpkg_extract_source_archive(${ARCHIVE_FILE})
+
+vcpkg_build_msbuild(
+    PROJECT_PATH ${CURRENT_BUILDTREES_DIR}/src/mpir-2.7.2/build.vc14/dll_mpir_gc/dll_mpir_gc.vcxproj
+)
+
+IF (TRIPLET_SYSTEM_ARCH MATCHES "x86")
+	SET(BUILD_ARCH "Win32")
+ELSE()
+	SET(BUILD_ARCH ${TRIPLET_SYSTEM_ARCH})
+ENDIF()
+
+file(INSTALL
+	${CURRENT_BUILDTREES_DIR}/src/mpir-2.7.2/dll/${BUILD_ARCH}/Debug/gmp.h
+	${CURRENT_BUILDTREES_DIR}/src/mpir-2.7.2/dll/${BUILD_ARCH}/Debug/gmpxx.h
+	${CURRENT_BUILDTREES_DIR}/src/mpir-2.7.2/dll/${BUILD_ARCH}/Debug/mpir.h
+	${CURRENT_BUILDTREES_DIR}/src/mpir-2.7.2/dll/${BUILD_ARCH}/Debug/mpirxx.h
+    DESTINATION ${CURRENT_PACKAGES_DIR}/include
+)
+file(INSTALL
+    ${CURRENT_BUILDTREES_DIR}/src/mpir-2.7.2/dll/${BUILD_ARCH}/Debug/mpir.dll
+	${CURRENT_BUILDTREES_DIR}/src/mpir-2.7.2/dll/${BUILD_ARCH}/Debug/mpir.pdb
+    DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin
+)
+file(INSTALL
+    ${CURRENT_BUILDTREES_DIR}/src/mpir-2.7.2/dll/${BUILD_ARCH}/Release/mpir.dll
+	${CURRENT_BUILDTREES_DIR}/src/mpir-2.7.2/dll/${BUILD_ARCH}/Release/mpir.pdb
+    DESTINATION ${CURRENT_PACKAGES_DIR}/bin
+)
+file(INSTALL
+    ${CURRENT_BUILDTREES_DIR}/src/mpir-2.7.2/dll/${BUILD_ARCH}/Debug/mpir.lib
+    DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
+)
+file(INSTALL
+    ${CURRENT_BUILDTREES_DIR}/src/mpir-2.7.2/dll/${BUILD_ARCH}/Release/mpir.lib
+    DESTINATION ${CURRENT_PACKAGES_DIR}/lib
+)
+
+file(INSTALL ${CURRENT_BUILDTREES_DIR}/src/mpir-2.7.2/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/mpir RENAME copyright)
+
+vcpkg_copy_pdbs()
+message(STATUS "Installing done")
diff --git a/ports/openal-soft/portfile.cmake b/ports/openal-soft/portfile.cmake
index 5e24d1630..22129cc87 100644
--- a/ports/openal-soft/portfile.cmake
+++ b/ports/openal-soft/portfile.cmake
@@ -3,6 +3,7 @@ vcpkg_download_distfile(ARCHIVE
     URL "http://openal-soft.org/openal-releases/openal-soft-1.17.2.tar.bz2"
     FILENAME "openal-soft-1.17.2.tar.bz2"
     MD5 1764e0d8fec499589b47ebc724e0913d
+    SHA512 50c20cd3ddada55d91643a79c2894d5a14315d5fc1ed8e870e3d8d3f410e8b7d8da29b838226e7fce37fbeca719ff919b51806f72e4cd529a18fbe8bd68860e3
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
diff --git a/ports/openssl/portfile.cmake b/ports/openssl/portfile.cmake
index 3737b0e86..0d017bdfc 100644
--- a/ports/openssl/portfile.cmake
+++ b/ports/openssl/portfile.cmake
@@ -8,7 +8,7 @@ set(ENV{PATH} "${PERL_EXE_PATH};$ENV{PATH}")
 vcpkg_download_distfile(OPENSSL_SOURCE_ARCHIVE
     URL "https://www.openssl.org/source/openssl-1.0.2h.tar.gz"
     FILENAME "openssl-1.0.2h.tar.gz"
-    MD5 9392e65072ce4b614c1392eefc1f23d0
+    SHA512 780601f6f3f32f42b6d7bbc4c593db39a3575f9db80294a10a68b2b0bb79448d9bd529ca700b9977354cbdfc65887c76af0aa7b90d3ee421f74ab53e6f15c303
 )
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${CURRENT_BUILDTREES_DIR}/src/openssl-1.0.2h)
diff --git a/ports/range-v3/portfile.cmake b/ports/range-v3/portfile.cmake
index e71229d0f..66a908362 100644
--- a/ports/range-v3/portfile.cmake
+++ b/ports/range-v3/portfile.cmake
@@ -2,7 +2,7 @@ include(vcpkg_common_functions)
 vcpkg_download_distfile(ARCHIVE
     URL "https://github.com/Microsoft/Range-V3-VS2015/archive/ede9ad367fd5ec764fecb039c874614bd908e6b6.zip"
     FILENAME "range-v3-ede9ad367fd5ec764fecb039c874614bd908e6b6.zip"
-    MD5 a33fcf63489d5c6d8fa92ef8746648ab
+    SHA512 e978c7694471d8616c248647b77689f377b3e2517347abde8629b140e5994de8bf686565a24cdd7dd222f325d43b775f5e478c91220dce75313985499b134637
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
diff --git a/ports/rapidjson/portfile.cmake b/ports/rapidjson/portfile.cmake
index fdc3aaaf4..3440428f0 100644
--- a/ports/rapidjson/portfile.cmake
+++ b/ports/rapidjson/portfile.cmake
@@ -2,7 +2,7 @@ include(vcpkg_common_functions)
 vcpkg_download_distfile(ARCHIVE
     URL "https://github.com/miloyip/rapidjson/archive/879def80f2e466cdf4c86dc7e53ea2dd4cafaea0.zip"
     FILENAME "rapidjson-879def80f2e466cdf4c86dc7e53ea2dd4cafaea0.zip"
-    MD5 5394c3bc23177b000e1992fb989edc53
+    SHA512 4d9ef7cce7d179344c33245c081a142ca5fcb2a0cc170ed39e3d0add008efab8e7389feec03e1ea83b30c5778cd0600865b08bc1c23592e5154dbe1f21f9547d
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
diff --git a/ports/rapidxml/portfile.cmake b/ports/rapidxml/portfile.cmake
index 03422aa1d..7cd885b7d 100644
--- a/ports/rapidxml/portfile.cmake
+++ b/ports/rapidxml/portfile.cmake
@@ -2,7 +2,7 @@ include(vcpkg_common_functions)
 vcpkg_download_distfile(ARCHIVE
     URL "https://sourceforge.net/projects/rapidxml/files/rapidxml/rapidxml%201.13/rapidxml-1.13.zip/download"
     FILENAME "rapidxml-1.13.zip"
-    MD5 7b4b42c9331c90aded23bb55dc725d6a
+    SHA512 6c10583e6631ccdb0217d0a5381172cb4c1046226de6ef1acf398d85e81d145228e14c3016aefcd7b70a1db8631505b048d8b4f5d4b0dbf1811d2482eefdd265
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
diff --git a/ports/sdl2/portfile.cmake b/ports/sdl2/portfile.cmake
index 8d5a95feb..69c6d3672 100644
--- a/ports/sdl2/portfile.cmake
+++ b/ports/sdl2/portfile.cmake
@@ -2,7 +2,7 @@ include(vcpkg_common_functions)
 vcpkg_download_distfile(ARCHIVE_FILE
     URL "http://libsdl.org/release/SDL2-2.0.4.tar.gz"
     FILENAME "SDL2-2.0.4.tar.gz"
-    MD5 44fc4a023349933e7f5d7a582f7b886e
+    SHA512 dd0a95878639856c0f4b8a579ace8071379ab64519fa139b22d3ed857a0f0db87a75bc8480c7207e02fbffd1fdbd448e3c0b882c451675b0e2f1a945af02e1d6
 )
 vcpkg_extract_source_archive(${ARCHIVE_FILE})
 
diff --git a/ports/sery/portfile.cmake b/ports/sery/portfile.cmake
index a6df423d3..34ddb0248 100644
--- a/ports/sery/portfile.cmake
+++ b/ports/sery/portfile.cmake
@@ -2,7 +2,7 @@ include(vcpkg_common_functions)
 vcpkg_download_distfile(ARCHIVE
     URL "https://github.com/Ninetainedo/Sery/archive/v1.0.zip"
     FILENAME "sery-1.0.0.zip"
-    MD5 6af526fb1b029dd989a35e44a6fa59a8
+    SHA512 15ef97bf094e8931049d8dd667a778e23847555f0f8d5b949b250e26edcc2541744fac5c34d935880d070546777fa787b1baf018d8ca2240fcd18a820aded04f
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
diff --git a/ports/sqlite3/portfile.cmake b/ports/sqlite3/portfile.cmake
index b9cc6abe3..9cdb67bb6 100644
--- a/ports/sqlite3/portfile.cmake
+++ b/ports/sqlite3/portfile.cmake
@@ -2,7 +2,7 @@ include(vcpkg_common_functions)
 vcpkg_download_distfile(ARCHIVE
     URL "http://www.sqlite.org/2016/sqlite-amalgamation-3120200.zip"
     FILENAME "sqlite-amalgamation-3120200.zip"
-    MD5 e3b10b952f075252169ac613068ccc97
+    SHA512 92e1cc09dc4d4e9dd4c189e4a5061664f11971eb3e14c4c59e1f489f201411b08a31dae9e6fc50fffd49bb72f88ac3d99b7c7cd5e334b3079c165ee1c4f5a16e
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
diff --git a/ports/stb/portfile.cmake b/ports/stb/portfile.cmake
index 79a599df6..dace9acd9 100644
--- a/ports/stb/portfile.cmake
+++ b/ports/stb/portfile.cmake
@@ -2,7 +2,7 @@ include(vcpkg_common_functions)
 vcpkg_download_distfile(ARCHIVE
     URL "https://github.com/nothings/stb/archive/e713a69f1ea6ee1e0d55725ed0731520045a5993.zip"
     FILENAME "stb-e713a69f1ea6ee1e0d55725ed0731520045a5993.zip"
-    MD5 5d81d3036610045d5a8076728c4e2f7e
+    SHA512 28d73905e626bf286bc42e30bc50e8449912a9db5e421e09bfbd17790de1909fe9df19c96d6ad3125a6ae0947d45b11b83ee5965dab68d1eadd0c332e391400e
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
diff --git a/ports/tiff/portfile.cmake b/ports/tiff/portfile.cmake
index c01914d87..e6d8d9cc6 100644
--- a/ports/tiff/portfile.cmake
+++ b/ports/tiff/portfile.cmake
@@ -2,7 +2,7 @@ include(vcpkg_common_functions)
 vcpkg_download_distfile(ARCHIVE
     URL "http://download.osgeo.org/libtiff/tiff-4.0.6.tar.gz"
     FILENAME "tiff-4.0.6.tar.gz"
-    MD5 d1d2e940dea0b5ad435f21f03d96dd72
+    SHA512 2c8dbaaaab9f82a7722bfe8cb6fcfcf67472beb692f1b7dafaf322759e7016dad1bc58457c0f03db50aa5bd088fef2b37358fcbc1524e20e9e14a9620373fdf8
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
diff --git a/ports/tinyxml2/portfile.cmake b/ports/tinyxml2/portfile.cmake
index 56c86d82a..4611ee94c 100644
--- a/ports/tinyxml2/portfile.cmake
+++ b/ports/tinyxml2/portfile.cmake
@@ -2,7 +2,7 @@ include(vcpkg_common_functions)
 vcpkg_download_distfile(ARCHIVE
     URL "https://github.com/leethomason/tinyxml2/archive/3.0.0.zip"
     FILENAME "tinyxml2-3.0.0.zip"
-    MD5 851ffc79097239cdc03a952094ddf437
+    SHA512 3581e086e41ea01418fdf74e53b932c41cada9a45b73fb71c15424672182dc2a1e55110f030962ae44df6f5d9f060478c5b04373f886da843a78fcabae8b063c
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
diff --git a/ports/zlib/portfile.cmake b/ports/zlib/portfile.cmake
index cbd942aeb..461304ffe 100644
--- a/ports/zlib/portfile.cmake
+++ b/ports/zlib/portfile.cmake
@@ -2,7 +2,7 @@ include(vcpkg_common_functions)
 vcpkg_download_distfile(ARCHIVE_FILE
     URL "http://zlib.net/zlib128.zip"
     FILENAME "zlib128.zip"
-    MD5 126f8676442ffbd97884eb4d6f32afb4
+    SHA512 b0d7e71eca9032910c56fc1de6adbdc4f915bdeafd9a114591fc05701893004ef3363add8ad0e576c956b6be158f2fc339ab393f2dd40e8cc8c2885d641d807b
 )
 vcpkg_extract_source_archive(${ARCHIVE_FILE})
 
diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake
index 26cc8a57b..262d52092 100644
--- a/scripts/buildsystems/vcpkg.cmake
+++ b/scripts/buildsystems/vcpkg.cmake
@@ -27,11 +27,11 @@ if(NOT VCPKG_TOOLCHAIN)
 
     if(CMAKE_BUILD_TYPE MATCHES "^Debug$" OR NOT DEFINED CMAKE_BUILD_TYPE)
         list(APPEND CMAKE_PREFIX_PATH
-            ${CMAKE_CURRENT_LIST_DIR}/../installed/${_VCPKG_TARGET_TRIPLET}/debug
+            ${CMAKE_CURRENT_LIST_DIR}/../../installed/${_VCPKG_TARGET_TRIPLET}/debug
         )
     endif()
     list(APPEND CMAKE_PREFIX_PATH
-        ${CMAKE_CURRENT_LIST_DIR}/../installed/${_VCPKG_TARGET_TRIPLET}
+        ${CMAKE_CURRENT_LIST_DIR}/../../installed/${_VCPKG_TARGET_TRIPLET}
     )
 
     include_directories(${CMAKE_CURRENT_LIST_DIR}/../installed/${_VCPKG_TARGET_TRIPLET}/include)
diff --git a/scripts/cmake/vcpkg_download_distfile.cmake b/scripts/cmake/vcpkg_download_distfile.cmake
index 7c36f5d97..3145c8851 100644
--- a/scripts/cmake/vcpkg_download_distfile.cmake
+++ b/scripts/cmake/vcpkg_download_distfile.cmake
@@ -1,20 +1,20 @@
-# Usage: vcpkg_download_distfile(<VAR> URL <http://...> FILENAME <output.zip> MD5 <5981de...>)
+# Usage: vcpkg_download_distfile(<VAR> URL <http://...> FILENAME <output.zip> SHA512 <5981de...>)
 function(vcpkg_download_distfile VAR)
-    set(oneValueArgs URL FILENAME MD5)
+    set(oneValueArgs URL FILENAME SHA512)
     cmake_parse_arguments(vcpkg_download_distfile "" "${oneValueArgs}" "" ${ARGN})
 
     if(EXISTS ${DOWNLOADS}/${vcpkg_download_distfile_FILENAME})
         message(STATUS "Using cached ${DOWNLOADS}/${vcpkg_download_distfile_FILENAME}")
-        file(MD5 ${DOWNLOADS}/${vcpkg_download_distfile_FILENAME} FILE_HASH)
-        if(NOT FILE_HASH MATCHES ${vcpkg_download_distfile_MD5})
+        file(SHA512 ${DOWNLOADS}/${vcpkg_download_distfile_FILENAME} FILE_HASH)
+        if(NOT FILE_HASH STREQUAL "${vcpkg_download_distfile_SHA512}")
             message(FATAL_ERROR
                 "File does not have expected hash: ${DOWNLOADS}/${vcpkg_download_distfile_FILENAME}\n"
-                "    ${FILE_HASH} <> ${vcpkg_download_distfile_MD5}\n"
+                "    '${FILE_HASH}' <> '${vcpkg_download_distfile_SHA512}'\n"
                 "Please delete the file and try again if this file should be downloaded again.")
         endif()
     else()
         message(STATUS "Downloading ${vcpkg_download_distfile_URL}")
-        file(DOWNLOAD ${vcpkg_download_distfile_URL} ${DOWNLOADS}/${vcpkg_download_distfile_FILENAME} EXPECTED_HASH MD5=${vcpkg_download_distfile_MD5})
+        file(DOWNLOAD ${vcpkg_download_distfile_URL} ${DOWNLOADS}/${vcpkg_download_distfile_FILENAME} EXPECTED_HASH SHA512=${vcpkg_download_distfile_SHA512})
     endif()
     set(${VAR} ${DOWNLOADS}/${vcpkg_download_distfile_FILENAME} PARENT_SCOPE)
 endfunction()
diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake
index ce2cdaa26..8f974240f 100644
--- a/scripts/cmake/vcpkg_find_acquire_program.cmake
+++ b/scripts/cmake/vcpkg_find_acquire_program.cmake
@@ -10,20 +10,20 @@ function(vcpkg_find_acquire_program VAR)
     set(PATHS ${DOWNLOADS}/tools/perl/perl/bin)
     set(URL "http://strawberryperl.com/download/5.20.2.1/strawberry-perl-5.20.2.1-64bit-portable.zip")
     set(ARCHIVE "strawberry-perl-5.20.2.1-64bit-portable.zip")
-    set(HASH 5fca4b3cfa7c9cc95e0c4fd8652eba80)
+    set(HASH 6e14e5580e52da5d35f29b67a52ef9db0e021af1575b4bbd84ebdbf18580522287890bdc21c0d21ddc1b2529d888f8e159dcaa017a3ff06d8fd23d16901bcc8b)
   elseif(VAR MATCHES "NASM")
     set(PROGNAME nasm)
     set(PATHS ${DOWNLOADS}/tools/nasm/nasm-2.11.08)
     set(URL "http://www.nasm.us/pub/nasm/releasebuilds/2.11.08/win32/nasm-2.11.08-win32.zip")
     set(ARCHIVE "nasm-2.11.08-win32.zip")
-    set(HASH 46a31e22be69637f7a9ccba12874133f)
+    set(HASH cd80b540530d3995d15dc636e97673f1d34f471baadf1dac993165232c61efefe7f8ec10625f8f718fc89f0dd3dcb6a4595e0cf40c5fd7cbac1b71672b644d2d)
   elseif(VAR MATCHES "YASM")
     set(PROGNAME yasm)
     set(PATHS ${DOWNLOADS}/tools/yasm)
     set(URL "http://www.tortall.net/projects/yasm/releases/yasm-1.3.0-win32.exe")
     set(ARCHIVE "yasm.exe")
     set(NOEXTRACT ON)
-    set(HASH 51e967dceddd1f84e67bff255df977b3)
+    set(HASH 850b26be5bbbdaeaf45ac39dd27f69f1a85e600c35afbd16b9f621396b3c7a19863ea3ff316b025b578fce0a8280eef2203306a2b3e46ee1389abb65313fb720)
   else()
     message(FATAL "unknown tool ${VAR} -- unable to acquire.")
   endif()
@@ -31,7 +31,7 @@ function(vcpkg_find_acquire_program VAR)
   find_program(${VAR} ${PROGNAME} PATHS ${PATHS})
   if(${VAR} MATCHES "-NOTFOUND")
     file(DOWNLOAD ${URL} ${DOWNLOADS}/${ARCHIVE}
-      EXPECTED_MD5 ${HASH}
+      EXPECTED_HASH SHA512=${HASH}
       SHOW_PROGRESS
     )
     file(MAKE_DIRECTORY ${DOWNLOADS}/tools/${PROGNAME})
diff --git a/scripts/ports.cmake b/scripts/ports.cmake
index 51afc8d61..eeb7b254c 100644
--- a/scripts/ports.cmake
+++ b/scripts/ports.cmake
@@ -1,5 +1,17 @@
 cmake_minimum_required(VERSION 3.5)
-get_filename_component(VCPKG_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR} DIRECTORY)
+
+#Detect .vcpkg-root to figure VCPKG_ROOT_DIR
+SET(VCPKG_ROOT_DIR_CANDIDATE ${CMAKE_CURRENT_LIST_DIR})
+while(IS_DIRECTORY ${VCPKG_ROOT_DIR_CANDIDATE} AND NOT EXISTS "${VCPKG_ROOT_DIR_CANDIDATE}/.vcpkg-root")
+    get_filename_component(VCPKG_ROOT_DIR_TEMP ${VCPKG_ROOT_DIR_CANDIDATE} DIRECTORY)
+    if (VCPKG_ROOT_DIR_TEMP STREQUAL VCPKG_ROOT_DIR_CANDIDATE) # If unchanged, we have reached the root of the drive
+        message(FATAL_ERROR "Could not find .vcpkg-root")
+    else()
+        SET(VCPKG_ROOT_DIR_CANDIDATE ${VCPKG_ROOT_DIR_TEMP})
+    endif()
+endwhile()
+
+set(VCPKG_ROOT_DIR ${VCPKG_ROOT_DIR_CANDIDATE})
 
 string(REGEX REPLACE "([^-]*)-([^-]*)" "\\1" TRIPLET_SYSTEM_ARCH ${TARGET_TRIPLET})
 string(REGEX REPLACE "([^-]*)-([^-]*)" "\\2" TRIPLET_SYSTEM_NAME ${TARGET_TRIPLET})
@@ -44,7 +56,7 @@ if(CMD MATCHES "^SCAFFOLD$")
             message(FATAL_ERROR "Error downloading file: ${error_code}")
         endif()
     endif()
-    file(MD5 ${DOWNLOADS}/${FILENAME} MD5)
+    file(SHA512 ${DOWNLOADS}/${FILENAME} SHA512)
 
     file(MAKE_DIRECTORY ports/${PORT})
     configure_file(scripts/templates/portfile.in.cmake ports/${PORT}/portfile.cmake @ONLY)
diff --git a/scripts/templates/portfile.in.cmake b/scripts/templates/portfile.in.cmake
index b29e2b682..99a3ac3e8 100644
--- a/scripts/templates/portfile.in.cmake
+++ b/scripts/templates/portfile.in.cmake
@@ -2,7 +2,7 @@ include(vcpkg_common_functions)
 vcpkg_download_distfile(ARCHIVE
     URL "@URL@"
     FILENAME "@FILENAME@"
-    MD5 @MD5@
+    SHA512 @SHA512@
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
diff --git a/toolsrc/include/vcpkg_Dependencies.h b/toolsrc/include/vcpkg_Dependencies.h
new file mode 100644
index 000000000..94aa51f99
--- /dev/null
+++ b/toolsrc/include/vcpkg_Dependencies.h
@@ -0,0 +1,13 @@
+#pragma once
+#include <vector>
+#include "package_spec.h"
+#include "StatusParagraphs.h"
+#include <unordered_set>
+#include "vcpkg_paths.h"
+
+namespace vcpkg {namespace Dependencies
+{
+    std::vector<package_spec> create_dependency_ordered_install_plan(const vcpkg_paths& paths, const std::vector<package_spec>& specs, const StatusParagraphs& status_db);
+
+    std::unordered_set<package_spec> find_unmet_dependencies(const vcpkg_paths& paths, const std::vector<package_spec>& specs, const StatusParagraphs& status_db);
+}}
diff --git a/toolsrc/include/vcpkg_Maps.h b/toolsrc/include/vcpkg_Maps.h
new file mode 100644
index 000000000..5b7b8ed46
--- /dev/null
+++ b/toolsrc/include/vcpkg_Maps.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include <unordered_map>
+#include <unordered_set>
+
+namespace vcpkg { namespace Maps
+{
+    template <typename K, typename V>
+    std::unordered_set<K> extract_key_set(const std::unordered_map<K, V>& input_map)
+    {
+        std::unordered_set<K> key_set;
+        for (auto const& element : input_map)
+        {
+            key_set.insert(element.first);
+        }
+        return key_set;
+    }
+}}
diff --git a/toolsrc/include/vcpkg_Sets.h b/toolsrc/include/vcpkg_Sets.h
new file mode 100644
index 000000000..7b330f31c
--- /dev/null
+++ b/toolsrc/include/vcpkg_Sets.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include "vcpkg_Checks.h"
+#include <unordered_set>
+
+namespace vcpkg { namespace Sets
+{
+    template <typename T, typename Container>
+    void remove_all(std::unordered_set<T>* input_set, Container remove_these)
+    {
+        Checks::check_throw(input_set != nullptr, "Input set cannot be null");
+        for (const T& r : remove_these)
+        {
+            input_set->erase(r);
+        }
+    }
+}}
diff --git a/toolsrc/include/vcpkg_cmd_arguments.h b/toolsrc/include/vcpkg_cmd_arguments.h
index 5a5075d23..704290589 100644
--- a/toolsrc/include/vcpkg_cmd_arguments.h
+++ b/toolsrc/include/vcpkg_cmd_arguments.h
@@ -28,7 +28,6 @@ namespace vcpkg
 
         void check_max_args(size_t arg_count, const char* example_text = nullptr) const;
         std::vector<package_spec> parse_all_arguments_as_package_specs(const vcpkg_paths& paths, const triplet& default_target_triplet, const char* example_text = nullptr) const;
-        std::vector<package_spec> extract_package_specs_with_unmet_dependencies(const vcpkg_paths& paths, const triplet& default_target_triplet, const StatusParagraphs& status_db) const;
 
     private:
         std::unordered_set<std::string> optional_command_arguments;
diff --git a/toolsrc/src/commands_installation.cpp b/toolsrc/src/commands_installation.cpp
index 0ca754dfc..0977dcf37 100644
--- a/toolsrc/src/commands_installation.cpp
+++ b/toolsrc/src/commands_installation.cpp
@@ -6,6 +6,7 @@
 #include "vcpkg_Files.h"
 #include "post_build_lint.h"
 #include "vcpkg_System.h"
+#include "vcpkg_Dependencies.h"
 
 namespace vcpkg
 {
@@ -59,18 +60,19 @@ namespace vcpkg
     {
         StatusParagraphs status_db = database_load_check(paths);
 
-        std::vector<package_spec> specs = args.extract_package_specs_with_unmet_dependencies(paths, default_target_triplet, status_db);
-        Checks::check_exit(!specs.empty(), "Specs cannot be empty");
-        std::string specs_string = to_string(specs[0]);
-        for (size_t i = 1; i < specs.size(); ++i)
+        std::vector<package_spec> specs = args.parse_all_arguments_as_package_specs(default_target_triplet);
+        std::vector<package_spec> install_plan = Dependencies::create_dependency_ordered_install_plan(paths, specs, status_db);
+        Checks::check_exit(!install_plan.empty(), "Install plan cannot be empty");
+        std::string specs_string = to_string(install_plan[0]);
+        for (size_t i = 1; i < install_plan.size(); ++i)
         {
             specs_string.push_back(',');
-            specs_string.append(to_string(specs[i]));
+            specs_string.append(to_string(install_plan[i]));
         }
         TrackProperty("installplan", specs_string);
         Environment::ensure_utilities_on_path(paths);
 
-        for (const package_spec& spec : specs)
+        for (const package_spec& spec : install_plan)
         {
             if (status_db.find_installed(spec.name, spec.target_triplet) != status_db.end())
             {
@@ -111,7 +113,27 @@ namespace vcpkg
 
     void build_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const triplet& default_target_triplet)
     {
+        // Currently the code won't work for multiple packages if one of them depends on another.
+        // Allowing only 1 package for now. 
+        args.check_max_args(1);
+
+        StatusParagraphs status_db = database_load_check(paths);
+
         std::vector<package_spec> specs = args.parse_all_arguments_as_package_specs(paths, default_target_triplet);
+        std::unordered_set<package_spec> unmet_dependencies = Dependencies::find_unmet_dependencies(paths, specs, status_db);
+        if (!unmet_dependencies.empty())
+        {
+            System::println(System::color::error, "The build command requires all dependencies to be already installed.");
+            System::println("The following dependencies are missing:");
+            System::println("");
+            for (const package_spec& p : unmet_dependencies)
+            {
+                System::println("    %s", p.name);
+            }
+            System::println("");
+            exit(EXIT_FAILURE);
+        }
+
         Environment::ensure_utilities_on_path(paths);
         for (const package_spec& spec : specs)
         {
diff --git a/toolsrc/src/vcpkg_Dependencies.cpp b/toolsrc/src/vcpkg_Dependencies.cpp
new file mode 100644
index 000000000..751b503c0
--- /dev/null
+++ b/toolsrc/src/vcpkg_Dependencies.cpp
@@ -0,0 +1,68 @@
+#include "vcpkg_Dependencies.h"
+#include <vector>
+#include "vcpkg_Graphs.h"
+#include "vcpkg_paths.h"
+#include "package_spec.h"
+#include "StatusParagraphs.h"
+#include <unordered_set>
+#include "vcpkg.h"
+#include "vcpkg_Maps.h"
+#include "vcpkg_Sets.h"
+
+namespace vcpkg { namespace Dependencies
+{
+    static Graphs::Graph<package_spec> build_dependency_graph(const vcpkg_paths& paths, const std::vector<package_spec>& specs, const StatusParagraphs& status_db)
+    {
+        std::vector<package_spec> examine_stack(specs);
+        std::unordered_set<package_spec> was_examined; // Examine = we have checked its immediate (non-recursive) dependencies
+        Graphs::Graph<package_spec> graph;
+        graph.add_vertices(examine_stack);
+
+        while (!examine_stack.empty())
+        {
+            package_spec spec = examine_stack.back();
+            examine_stack.pop_back();
+
+            if (was_examined.find(spec) != was_examined.end())
+            {
+                continue;
+            }
+
+            std::vector<std::string> dependencies_as_string = get_unmet_package_dependencies(paths, spec, status_db);
+
+            for (const std::string& dep_as_string : dependencies_as_string)
+            {
+                package_spec current_dep = {dep_as_string, spec.target_triplet};
+                auto it = status_db.find(current_dep.name, current_dep.target_triplet);
+                if (it != status_db.end() && (*it)->want == want_t::install)
+                {
+                    continue;
+                }
+
+                graph.add_edge(spec, current_dep);
+                if (was_examined.find(current_dep) == was_examined.end())
+                {
+                    examine_stack.push_back(std::move(current_dep));
+                }
+            }
+
+            was_examined.insert(spec);
+        }
+
+        return graph;
+    }
+
+    std::vector<package_spec> create_dependency_ordered_install_plan(const vcpkg_paths& paths, const std::vector<package_spec>& specs, const StatusParagraphs& status_db)
+    {
+        return build_dependency_graph(paths, specs, status_db).find_topological_sort();
+    }
+
+    std::unordered_set<package_spec> find_unmet_dependencies(const vcpkg_paths& paths, const std::vector<package_spec>& specs, const StatusParagraphs& status_db)
+    {
+        const Graphs::Graph<package_spec> dependency_graph = build_dependency_graph(paths, specs, status_db);
+        std::unordered_set<package_spec> key_set = Maps::extract_key_set(dependency_graph.adjacency_list());
+        Sets::remove_all(&key_set, specs);
+
+        return key_set;
+    }
+}}
diff --git a/toolsrc/src/vcpkg_cmd_arguments.cpp b/toolsrc/src/vcpkg_cmd_arguments.cpp
index d302ee42e..e0f3f04ee 100644
--- a/toolsrc/src/vcpkg_cmd_arguments.cpp
+++ b/toolsrc/src/vcpkg_cmd_arguments.cpp
@@ -179,48 +179,7 @@ namespace vcpkg
         }
     }
 
-    std::vector<package_spec> vcpkg_cmd_arguments::extract_package_specs_with_unmet_dependencies(const vcpkg_paths& paths, const triplet& default_target_triplet, const StatusParagraphs& status_db) const
-    {
-        std::vector<package_spec> specs = parse_all_arguments_as_package_specs(paths, default_target_triplet);
-        std::unordered_set<package_spec> had_its_immediate_dependencies_added;
-        Graphs::Graph<package_spec> graph;
-        graph.add_vertices(specs);
-
-        while (!specs.empty())
-        {
-            package_spec spec = specs.back();
-            specs.pop_back();
-
-            if (had_its_immediate_dependencies_added.find(spec) != had_its_immediate_dependencies_added.end())
-            {
-                continue;
-            }
-
-            std::vector<std::string> dependencies_as_string = get_unmet_package_dependencies(paths, spec, status_db);
-
-            for (const std::string& dep_as_string : dependencies_as_string)
-            {
-                package_spec current_dep = {dep_as_string, spec.target_triplet};
-                auto it = status_db.find(current_dep.name, current_dep.target_triplet);
-                if (it != status_db.end() && (*it)->want == want_t::install)
-                {
-                    continue;
-                }
-
-                graph.add_edge(spec, current_dep);
-                if (had_its_immediate_dependencies_added.find(current_dep) == had_its_immediate_dependencies_added.end())
-                {
-                    specs.push_back(std::move(current_dep));
-                }
-            }
-
-            had_its_immediate_dependencies_added.insert(spec);
-        }
-
-        return graph.find_topological_sort();
-    }
-
-    std::vector<package_spec> vcpkg_cmd_arguments::parse_all_arguments_as_package_specs(const vcpkg_paths& paths, const triplet& default_target_triplet, const char* example_text) const
+    std::vector<package_spec> vcpkg_cmd_arguments::parse_all_arguments_as_package_specs(const vcpkg_paths& const triplet& default_target_triplet, const char* example_text) const
     {
         size_t arg_count = command_arguments.size();
         if (arg_count < 1)
diff --git a/toolsrc/vcpkg/vcpkg.vcxproj b/toolsrc/vcpkg/vcpkg.vcxproj
index 065d1b9c5..a59683470 100644
--- a/toolsrc/vcpkg/vcpkg.vcxproj
+++ b/toolsrc/vcpkg/vcpkg.vcxproj
@@ -139,6 +139,7 @@
     <ClCompile Include="..\src\commands_update.cpp" />
     <ClCompile Include="..\src\vcpkg_cmd_arguments.cpp" />
     <ClCompile Include="..\src\commands_other.cpp" />
+    <ClCompile Include="..\src\vcpkg_Dependencies.cpp" />
     <ClCompile Include="..\src\vcpkg_Environment.cpp" />
     <ClCompile Include="..\src\commands_installation.cpp" />
     <ClCompile Include="..\src\commands_integration.cpp" />
@@ -149,6 +150,7 @@
   <ItemGroup>
     <ClInclude Include="..\include\vcpkg_cmd_arguments.h" />
     <ClInclude Include="..\include\vcpkg_Commands.h" />
+    <ClInclude Include="..\include\vcpkg_Dependencies.h" />
     <ClInclude Include="..\include\vcpkg_Environment.h" />
     <ClInclude Include="..\include\post_build_lint.h" />
   </ItemGroup>
diff --git a/toolsrc/vcpkg/vcpkg.vcxproj.filters b/toolsrc/vcpkg/vcpkg.vcxproj.filters
index 95aa0ceb7..2e8a343fc 100644
--- a/toolsrc/vcpkg/vcpkg.vcxproj.filters
+++ b/toolsrc/vcpkg/vcpkg.vcxproj.filters
@@ -66,6 +66,9 @@
     <ClCompile Include="..\src\commands_import.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\vcpkg_Dependencies.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\include\post_build_lint.h">
@@ -80,5 +83,8 @@
     <ClInclude Include="..\include\vcpkg_Environment.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\include\vcpkg_Dependencies.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/toolsrc/vcpkgcommon/vcpkgcommon.vcxproj b/toolsrc/vcpkgcommon/vcpkgcommon.vcxproj
index 95cfd5764..d5e68fde3 100644
--- a/toolsrc/vcpkgcommon/vcpkgcommon.vcxproj
+++ b/toolsrc/vcpkgcommon/vcpkgcommon.vcxproj
@@ -131,6 +131,8 @@
     <ClInclude Include="..\include\vcpkg_Checks.h" />
     <ClInclude Include="..\include\vcpkg_Files.h" />
     <ClInclude Include="..\include\vcpkg_Graphs.h" />
+    <ClInclude Include="..\include\vcpkg_Maps.h" />
+    <ClInclude Include="..\include\vcpkg_Sets.h" />
     <ClInclude Include="..\include\vcpkg_Strings.h" />
     <ClInclude Include="..\include\vcpkg_System.h" />
   </ItemGroup>
diff --git a/toolsrc/vcpkgcommon/vcpkgcommon.vcxproj.filters b/toolsrc/vcpkgcommon/vcpkgcommon.vcxproj.filters
index a7e98c853..ae747d687 100644
--- a/toolsrc/vcpkgcommon/vcpkgcommon.vcxproj.filters
+++ b/toolsrc/vcpkgcommon/vcpkgcommon.vcxproj.filters
@@ -50,5 +50,11 @@
     <ClInclude Include="..\include\opt_bool.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\include\vcpkg_Maps.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\vcpkg_Sets.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file