Merge pull request #6 from Microsoft/master

Update from Microsoft master

CHANGELOG.md

@@ -1,3 +1,36 @@
+vcpkg (0.0.84)
+--------------
+  * Add ports:
+    - cfitsio              3.410
+    - chmlib               0.40
+    - gl2ps                OpenGL to PostScript Printing Library
+    - libharu              2017-08-15-d84867ebf9f-1
+    - mpfr                 3.1.5
+    - sophus               1.0.0
+  * Update ports:
+    - allegro5             5.2.1.0 -> 5.2.2.0
+    - blaze                3.1 -> 3.2
+    - boost                1.64-5 -> 1.65
+    - curl                 7.51.0-3 -> 7.55.0
+    - flann                1.9.1-4 -> 1.9.1-5
+    - gdal                 1.11.3-4 -> 1.11.3-5
+    - glew                 2.0.0-2 -> 2.1.0
+    - lcms                 2.8-1 -> 2.8-2
+    - libogg               2017-07-27-cab46b19847 -> 1.3.2-cab46b1-2
+    - libuv                1.13.1 -> 1.14.0
+    - lz4                  1.7.5 -> 1.8.0
+    - pcre2                10.23 -> 10.30
+    - spdlog               0.13.0 -> 0.14.0
+    - zstd                 1.3.0 -> 1.3.1
+  * Bump required version & auto-downloaded version of `git` to 2.14.1 (due to a security vulnerability)
+  * Show more information when there are issues acquiring `vcpkg` tool dependencies (`git`, `cmake`, `nuget`)
+  * Remove download prompts for cmake/git. The prompts were causing a lot of issues for users and especially CI builds
+  * `vcpkg edit`: Fix detection of 64-bit VSCode
+  * Fixes and improvements in the `vcpkg` tool itself
+
+-- vcpkg team <[email protected]>  TUE, 22 Aug 2017 13:00:00 -0800
+
+
 vcpkg (0.0.83)
 --------------
   * Add ports:

ports/blaze/CONTROL

@@ -1,3 +1,3 @@
 Source: blaze
-Version: 3.1
+Version: 3.2
 Description: Blaze is an open-source, high-performance C++ math library for dense and sparse arithmetic.

ports/blaze/portfile.cmake

@@ -1,11 +1,11 @@
 #header-only library
 include(vcpkg_common_functions)
 
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/blaze-3.1)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/blaze-3.2)
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://bitbucket.org/blaze-lib/blaze/downloads/blaze-3.1.tar.gz"
-    FILENAME "blaze-3.1.tar.gz"
-    SHA512 fe03a7615d4105d6a869cfd69b3db3165b838eff53cdff7adbbd5ae9d753aa009bbab50925463c6704f9530a4c4ad5605e373b3cbaee96ca982a474a665ed756
+    URLS "https://bitbucket.org/blaze-lib/blaze/downloads/blaze-3.2.tar.gz"
+    FILENAME "blaze-3.2.tar.gz"
+    SHA512 33d2bb0a49a33e71c88a45ab9e8418160c09b877b3ebe5ff7aa48ec0973e28e8a282374604d56f1b5cf2722946e4ca84aa2b401a341240a2ab9debd72505148e
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 

ports/libharu/CONTROL

@@ -1,4 +1,4 @@
 Source: libharu
-Version: 2017-08-15-d84867ebf9f
+Version: 2017-08-15-d84867ebf9f-1
 Description: libharu - free PDF library
 Build-Depends: zlib,libpng

ports/libharu/portfile.cmake

@@ -9,7 +9,6 @@ vcpkg_from_github(
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
-    OPTIONS_DEBUG -DLIBHPDF_DEBUG=ON
 )
 
 vcpkg_build_cmake()
@@ -34,7 +33,7 @@ file(GLOB DEBUG_LIBS
     "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Debug/*.lib"
     "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*/Debug/*.lib"
 )
-file(GLOB HEADERS "${SOURCE_PATH}/include/*.h" "${CMAKE_BINARY_DIR}/include/*.h")
+file(GLOB HEADERS "${SOURCE_PATH}/include/*.h" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/include/*.h")
 
 if(DLLS)
     file(INSTALL ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin)

ports/sophus/CONTROL

@@ -0,0 +1,4 @@
+Source: sophus
+Version: 1.0.0
+Build-Depends: eigen3, ceres
+Description: Lie group library for C++

ports/sophus/portfile.cmake

@@ -0,0 +1,27 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO strasdat/Sophus
+    REF v1.0.0 
+    SHA512 569634a8be9237d2240cf30c01e2677ece75d55f1196030f1228baca62fa22460e8ceb2a63bd46afdf7f02d8eb79c59d6ed666228b852da78590de897b278fab
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/Sophus")
+
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib)
+
+# Put the license file where vcpkg expects it
+file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/Sophus/)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/Sophus/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/Sophus/copyright)

ports/zstd/CONTROL

@@ -1,3 +1,3 @@
 Source: zstd
-Version: 1.3.0
+Version: 1.3.1
 Description: Zstandard - Fast real-time compression algorithm http://www.zstd.net

ports/zstd/portfile.cmake

@@ -2,8 +2,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebook/zstd
-    REF v1.3.0
-    SHA512 5eb9e001e14d3342e76eb57b672c636fd56839ba8fc0ba9a751484ea93389c72c494ad2125dc2f9be1f72481f3af34568477123f7e9d3c7504e061e4c083cb30
+    REF v1.3.1
+    SHA512 cc2ace7b2dd19a2bbf4c43a89d64a7ce121309f712bfb4940ccfd6f9353f1466612ef7096adcd852f54eaea8663d884acf681c83ae5b274b24c9b85f21367b7c
     HEAD_REF dev)
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
@@ -14,6 +14,11 @@ else()
     set(ZSTD_SHARED 1)
 endif()
 
+# Enable multithreaded mode. CMake build doesn't provide a multithreaded
+# library target, but it is the default in Makefile and VS projects.
+set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} /DZSTD_MULTITHREAD")
+set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS}")
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}/build/cmake
     PREFER_NINJA
@@ -38,4 +43,5 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
 endif()
 
 file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/zstd)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/zstd/LICENSE ${CURRENT_PACKAGES_DIR}/share/zstd/copyright)
+file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/zstd)
+file(WRITE ${CURRENT_PACKAGES_DIR}/share/zstd/copyright "ZSTD is dual licensed - see LICENSE and COPYING files\n")

toolsrc/VERSION.txt

@@ -1 +1 @@
-"0.0.83"
+"0.0.84"