microsoft · cbezault · Jun 21, 2019 · Jun 1, 2019 · Jun 1, 2019 · Jun 1, 2019
diff --git a/ports/alembic/CONTROL b/ports/alembic/CONTROL
@@ -1,4 +1,4 @@
 Source: alembic
-Version: 1.7.11
+Version: 1.7.11-1
 Build-Depends: ilmbase, hdf5
-Description: Alembic is an open framework for storing and sharing scene data that includes a C++ library, a file format, and client plugins and applications. http://alembic.io/
+Description: Alembic is an open framework for storing and sharing scene data that includes a C++ library, a file format, and client plugins and applications.
diff --git a/ports/alembic/portfile.cmake b/ports/alembic/portfile.cmake
@@ -30,7 +30,7 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/Alembic")
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Alembic)
 
 vcpkg_copy_pdbs()
 

diff --git a/ports/angelscript/CONTROL b/ports/angelscript/CONTROL
@@ -1,3 +1,3 @@
 Source: angelscript
-Version: 2.33.0
-Description: The AngelCode Scripting Library, or AngelScript as it is also known, is an extremely flexible cross-platform scripting library designed to allow applications to extend their functionality through external scripts. It has been designed from the beginning to be an easy to use component, both for the application programmer and the script writer. 
+Version: 2.33.0-1
+Description: The AngelCode Scripting Library, or AngelScript as it is also known, is an extremely flexible cross-platform scripting library designed to allow applications to extend their functionality through external scripts. It has been designed from the beginning to be an easy to use component, both for the application programmer and the script writer.
diff --git a/ports/angelscript/portfile.cmake b/ports/angelscript/portfile.cmake
@@ -1,15 +1,3 @@
-# Common Ambient Variables:
-#   CURRENT_BUILDTREES_DIR    = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
-#   CURRENT_PACKAGES_DIR      = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
-#   CURRENT_PORT_DIR          = ${VCPKG_ROOT_DIR}\ports\${PORT}
-#   PORT                      = current port name (zlib, etc)
-#   TARGET_TRIPLET            = current triplet (x86-windows, x64-windows-static, etc)
-#   VCPKG_CRT_LINKAGE         = C runtime linkage type (static, dynamic)
-#   VCPKG_LIBRARY_LINKAGE     = target library linkage type (static, dynamic)
-#   VCPKG_ROOT_DIR            = <C:\path\to\current\vcpkg>
-#   VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm)
-#
-
 include(vcpkg_common_functions)
 
 vcpkg_download_distfile(ARCHIVE
@@ -20,14 +8,9 @@ vcpkg_download_distfile(ARCHIVE
 
 vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE ${ARCHIVE} 
-    # (Optional) A friendly name to use instead of the filename of the archive (e.g.: a version number or tag).
-    # REF 1.0.0
-    # (Optional) Read the docs for how to generate patches at: 
-    # https://github.com/Microsoft/vcpkg/blob/master/docs/examples/patching.md
+    ARCHIVE ${ARCHIVE}
     PATCHES
        mark-threads-private.patch
-    #   002_more_port_fixes.patch
 )
 
 vcpkg_configure_cmake(
@@ -41,10 +24,7 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/Angelscript")
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Angelscript)
 
 # Handle copyright
 file(INSTALL ${CURRENT_PORT_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/angelscript RENAME copyright)
-
-# Post-build test for cmake libraries
-# vcpkg_test_cmake(PACKAGE_NAME angelscript)
diff --git a/ports/armadillo/CONTROL b/ports/armadillo/CONTROL
@@ -1,4 +1,4 @@
 Source: armadillo
-Version: 2019-04-16-1
+Version: 2019-04-16-2
 Description: Armadillo is a high quality linear algebra library (matrix maths) for the C++ language, aiming towards a good balance between speed and ease of use
 Build-Depends: openblas (!osx), clapack (!osx)
diff --git a/ports/armadillo/portfile.cmake b/ports/armadillo/portfile.cmake
@@ -25,7 +25,7 @@ vcpkg_configure_cmake(
 )
 
 vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/armadillo/CMake TARGET_PATH share/armadillo)
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/armadillo/CMake)
 
 vcpkg_copy_pdbs()
 

diff --git a/ports/arrow/CONTROL b/ports/arrow/CONTROL
@@ -1,4 +1,4 @@
 Source: arrow
-Version: 0.13.0-3
+Version: 0.13.0-4
 Build-Depends: boost-system, boost-filesystem, boost-multiprecision, boost-algorithm, flatbuffers, rapidjson, zlib, lz4, brotli, zstd, snappy, gflags, thrift, double-conversion, glog, uriparser
 Description: Apache Arrow is a columnar in-memory analytics layer designed to accelerate big data. It houses a set of canonical in-memory representations of flat and hierarchical data along with multiple language-bindings for structure manipulation. It also provides IPC and common algorithm implementations.
diff --git a/ports/arrow/portfile.cmake b/ports/arrow/portfile.cmake
@@ -42,7 +42,7 @@ if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/arrow_static.lib)
     message(FATAL_ERROR "Installed lib file should be named 'arrow.lib' via patching the upstream build.")
 endif()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/arrow TARGET_PATH share/arrow)
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/arrow)
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake)

diff --git a/ports/assimp/CONTROL b/ports/assimp/CONTROL
@@ -1,4 +1,4 @@
 Source: assimp
-Version: 4.1.0-5
+Version: 4.1.0-8
 Description: The Open Asset import library
 Build-Depends: zlib, rapidjson
diff --git a/ports/assimp/portfile.cmake b/ports/assimp/portfile.cmake
@@ -18,21 +18,27 @@ file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/zlib ${SOURCE_PATH}/contrib/gtest ${S
 set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -D_CRT_SECURE_NO_WARNINGS")
 set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS")
 
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+  set(VCPKG_BUILD_SHARED_LIBS ON)
+else()
+  set(VCPKG_BUILD_SHARED_LIBS OFF)
+endif()
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS -DASSIMP_BUILD_TESTS=OFF
             -DASSIMP_BUILD_ASSIMP_VIEW=OFF
             -DASSIMP_BUILD_ZLIB=OFF
-            -DASSIMP_BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
+            -DASSIMP_BUILD_SHARED_LIBS=${VCPKG_BUILD_SHARED_LIBS}
             -DASSIMP_BUILD_ASSIMP_TOOLS=OFF
             -DASSIMP_INSTALL_PDB=OFF
             #-DSYSTEM_IRRXML=ON # Wait for the built-in irrxml to synchronize with port irrlich, add dependencies and enable this macro
 )
 
 vcpkg_install_cmake()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/assimp-4.1")
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/assimp-4.1)
 
 vcpkg_copy_pdbs()
 
@@ -44,7 +50,7 @@ file(READ ${CURRENT_PACKAGES_DIR}/share/assimp/assimp-config.cmake ASSIMP_CONFIG
 string(REPLACE "get_filename_component(ASSIMP_ROOT_DIR \"\${_PREFIX}\" PATH)"
                "set(ASSIMP_ROOT_DIR \${_PREFIX})" ASSIMP_CONFIG ${ASSIMP_CONFIG})
 
-if(WIN32)
+if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
   if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
     string(REPLACE "set( ASSIMP_LIBRARIES \${ASSIMP_LIBRARIES})"
                    "set( ASSIMP_LIBRARIES optimized \${ASSIMP_LIBRARY_DIRS}/\${ASSIMP_LIBRARIES}.lib debug \${ASSIMP_LIBRARY_DIRS}/../debug/lib/\${ASSIMP_LIBRARIES}d.lib)" ASSIMP_CONFIG ${ASSIMP_CONFIG})

diff --git a/ports/aws-c-common/CONTROL b/ports/aws-c-common/CONTROL
@@ -1,3 +1,3 @@
 Source: aws-c-common
-Version: 0.3.0
-Description: AWS common library for C
+Version: 0.3.0-1
+Description: AWS common library for C
diff --git a/ports/aws-c-common/portfile.cmake b/ports/aws-c-common/portfile.cmake
@@ -16,7 +16,7 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()
 
 vcpkg_fixup_cmake_targets(CONFIG_PATH lib/aws-c-common/cmake)
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share/cmake)
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake)
 
 file(REMOVE_RECURSE
 	${CURRENT_PACKAGES_DIR}/debug/include
@@ -31,4 +31,4 @@ file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/aw
 
 file(REMOVE_RECURSE
 	${CURRENT_PACKAGES_DIR}/debug/share
-)
+)
diff --git a/ports/aws-c-event-stream/portfile.cmake b/ports/aws-c-event-stream/portfile.cmake
@@ -12,7 +12,7 @@ vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
 	OPTIONS
-		"-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/cmake"
+		"-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common"
 )
 
 vcpkg_install_cmake()
@@ -32,4 +32,4 @@ file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/aw
 
 file(REMOVE_RECURSE
 	${CURRENT_PACKAGES_DIR}/debug/share
-)
+)
diff --git a/ports/azure-storage-cpp/CONTROL b/ports/azure-storage-cpp/CONTROL
@@ -1,5 +1,5 @@
 Source: azure-storage-cpp
 Version: 6.1.0
-Build-Depends: cpprestsdk[core], atlmfc (windows), boost-log (!windows&!uwp), boost-locale (!windows&!uwp), libxml2 (!windows&!uwp), libuuid (!windows&!uwp&!osx), gettext
+Build-Depends: cpprestsdk, atlmfc (windows), boost-log (!windows&!uwp), boost-locale (!windows&!uwp), libxml2 (!windows&!uwp), libuuid (!windows&!uwp&!osx), gettext
 Description: Microsoft Azure Storage Client SDK for C++
   A client library for working with Microsoft Azure storage services including blobs, files, tables, and queues. This client library enables working with the Microsoft Azure storage services which include the blob service for storing binary and text data, the file service for storing binary and text data, the table service for storing structured non-relational data, and the queue service for storing messages that may be accessed by a client. Microsoft Azure Storage team's blog - http://blogs.msdn.com/b/windowsazurestorage/
diff --git a/ports/botan/CONTROL b/ports/botan/CONTROL
@@ -1,3 +1,3 @@
 Source: botan
-Version: 2.9.0
+Version: 2.9.0-1
 Description: A cryptography library written in C++11
diff --git a/ports/botan/portfile.cmake b/ports/botan/portfile.cmake
@@ -14,12 +14,12 @@ set(NUMBER_OF_PROCESSORS "1")
 if(DEFINED ENV{NUMBER_OF_PROCESSORS})
     set(NUMBER_OF_PROCESSORS $ENV{NUMBER_OF_PROCESSORS})
 else()
-    if(APPLE)
+    if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
         set(job_count_command sysctl -n hw.physicalcpu)
     else()
         set(job_count_command nproc)
     endif()
-    execute_process( 
+    execute_process(
             COMMAND ${job_count_command}
             OUTPUT_VARIABLE NUMBER_OF_PROCESSORS
         )
@@ -93,7 +93,7 @@ function(BOTAN_BUILD BOTAN_BUILD_TYPE)
                             --link-method=copy)
     if(CMAKE_HOST_WIN32)
         list(APPEND configure_arguments ${BOTAN_MSVC_RUNTIME}${BOTAN_MSVC_RUNTIME_SUFFIX})
-    endif()    
+    endif()
 
     vcpkg_execute_required_process(
         COMMAND "${PYTHON3}" "${SOURCE_PATH}/configure.py" ${configure_arguments}

diff --git a/ports/c-ares/CONTROL b/ports/c-ares/CONTROL
@@ -1,4 +1,4 @@
 Source: c-ares
-Version: 2019-5-2
+Version: 2019-05-02-1
 Description: A C library for asynchronous DNS requests
 Build-Depends:
diff --git a/ports/c-ares/portfile.cmake b/ports/c-ares/portfile.cmake
@@ -30,7 +30,7 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/c-ares")
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/c-ares)
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)

diff --git a/ports/capnproto/CONTROL b/ports/capnproto/CONTROL
@@ -1,4 +1,4 @@
 Source: capnproto
-Version: 0.7.0-1
+Version: 0.7.0-2
 Description: Data interchange format and capability-based RPC system https://capnproto.org/
 Build-Depends: zlib
diff --git a/ports/capnproto/portfile.cmake b/ports/capnproto/portfile.cmake
@@ -23,7 +23,7 @@ vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH})
 
 vcpkg_install_cmake()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/CapnProto")
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/CapnProto)
 
 file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools")
 file(RENAME "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/tools/capnproto")
@@ -39,4 +39,4 @@ file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/capnp
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/capnproto/LICENSE ${CURRENT_PACKAGES_DIR}/share/capnproto/copyright)
 
 # Disabled for now, see #5630 and #5635
-# vcpkg_test_cmake(PACKAGE_NAME CapnProto)
+# vcpkg_test_cmake(PACKAGE_NAME CapnProto)
diff --git a/ports/cartographer/CONTROL b/ports/cartographer/CONTROL
@@ -1,4 +1,4 @@
 Source: cartographer
-Version: 1.0.0
+Version: 1.0.0-1
 Build-Depends: ceres[suitesparse], gflags, glog, lua, cairo, boost-iostreams, gtest, protobuf
-Description: Google 2D & 3D SLAM package
+Description: Google 2D & 3D SLAM package
diff --git a/ports/cartographer/portfile.cmake b/ports/cartographer/portfile.cmake
@@ -27,7 +27,7 @@ vcpkg_configure_cmake(
 )
 
 vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/cartographer)
+vcpkg_fixup_cmake_targets()
 vcpkg_copy_pdbs()
 
 # Clean

diff --git a/ports/catch2/CONTROL b/ports/catch2/CONTROL
@@ -1,4 +1,3 @@
 Source: catch2
-Version: 2.7.2
+Version: 2.7.2-1
 Description: A modern, header-only test framework for unit testing.
-  Issues, PRs and changelogs can be found at https://github.com/catchorg/Catch2
diff --git a/ports/catch2/portfile.cmake b/ports/catch2/portfile.cmake
@@ -18,7 +18,7 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Catch2 TARGET_PATH share/catch2)
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Catch2)
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)
 

diff --git a/ports/ccd/CONTROL b/ports/ccd/CONTROL
@@ -1,3 +1,3 @@
 Source: ccd
-Version: 2.1
+Version: 2.1-1
 Description: Library for collision detection between two convex shapes
diff --git a/ports/ccd/portfile.cmake b/ports/ccd/portfile.cmake
@@ -1,12 +1,12 @@
 include(vcpkg_common_functions)
 
-vcpkg_from_github( 
-    OUT_SOURCE_PATH SOURCE_PATH 
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
     REPO danfis/libccd
     REF v2.1
     SHA512 ff037d9c4df50f09600cf9b3514b259b2850ff43f74817853f5665d22812891168f70bd3cc3969b2c9e3c706f6254991a65421476349607fbd04d894b217456d
-    HEAD_REF master 
-) 
+    HEAD_REF master
+)
 
 vcpkg_apply_patches(
     SOURCE_PATH ${SOURCE_PATH}
@@ -21,7 +21,7 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/ccd")
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/ccd)
 
 file(INSTALL ${SOURCE_PATH}/BSD-LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/ccd RENAME copyright)
 

diff --git a/ports/cereal/CONTROL b/ports/cereal/CONTROL
@@ -1,3 +1,3 @@
 Source: cereal
-Version: 1.2.2-1
+Version: 1.2.2-2
 Description: a header-only C++11 serialization library (built in support for binary, XML and JSon)
diff --git a/ports/cereal/portfile.cmake b/ports/cereal/portfile.cmake
@@ -18,8 +18,7 @@ vcpkg_configure_cmake(
 )
 
 vcpkg_install_cmake()
-
-vcpkg_fixup_cmake_targets(CONFIG_PATH "share/cmake/cereal")
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/cereal)
 
 # Clean
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)

diff --git a/ports/ceres/0001_add_missing_include_path.patch b/ports/ceres/0001_add_missing_include_path.patch
diff --git a/ports/ceres/0002_cmakelists_fixes.patch → ports/ceres/0001_cmakelists_fixes.patch b/ports/ceres/0002_cmakelists_fixes.patch → ports/ceres/0001_cmakelists_fixes.patch
@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 15a947e..62d8c59 100644
+index 02c72b5..62d8c59 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -374,27 +374,7 @@ if (MINIGLOG)
@@ -31,6 +31,15 @@ index 15a947e..62d8c59 100644
  endif (MINIGLOG)
 
  if (NOT SCHUR_SPECIALIZATIONS)
+@@ -582,7 +562,7 @@ include_directories(
+ # Note that this is *not* propagated to clients, ie CERES_INCLUDE_DIRS
+ # used by clients after find_package(Ceres) does not identify Eigen as
+ # as system headers.
+-include_directories(SYSTEM ${EIGEN_INCLUDE_DIRS})
++include_directories(SYSTEM ${EIGEN_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}/Eigen)
+
+ if (SUITESPARSE)
+   include_directories(${SUITESPARSE_INCLUDE_DIRS})
 @@ -917,8 +897,6 @@ install(FILES "${Ceres_BINARY_DIR}/CeresConfig-install.cmake"
          DESTINATION ${RELATIVE_CMAKECONFIG_INSTALL_DIR})
  install(FILES "${Ceres_BINARY_DIR}/CeresConfigVersion.cmake"

diff --git a/ports/ceres/0003_use_glog_target.patch → ports/ceres/0002_use_glog_target.patch b/ports/ceres/0003_use_glog_target.patch → ports/ceres/0002_use_glog_target.patch
diff --git a/...eres/0004_fix_exported_ceres_config.patch → ...eres/0003_fix_exported_ceres_config.patch b/...eres/0004_fix_exported_ceres_config.patch → ...eres/0003_fix_exported_ceres_config.patch
diff --git a/ports/ceres/0004_blas_linux_fix.patch b/ports/ceres/0004_blas_linux_fix.patch
@@ -0,0 +1,22 @@
+diff --git a/internal/ceres/blas.cc b/internal/ceres/blas.cc
+index 3ba63bb..071a26e 100644
+--- a/internal/ceres/blas.cc
++++ b/internal/ceres/blas.cc
+@@ -33,7 +33,7 @@
+ #include "glog/logging.h"
+
+ #ifndef CERES_NO_LAPACK
+-extern "C" void dsyrk_(char* uplo,
++extern "C" void dsyrk(char* uplo,
+                        char* trans,
+                        int* n,
+                        int* k,
+@@ -64,7 +64,7 @@ void BLAS::SymmetricRankKUpdate(int num_rows,
+   int k = transpose ? num_rows : num_cols;
+   int lda = k;
+   int ldc = n;
+-  dsyrk_(&uplo,
++  dsyrk(&uplo,
+          &trans,
+          &n,
+          &k,