Merge pull request #1 from Microsoft/master

Update vcpkg from upstream

3 files changed, 64 insertions, 28 deletions

diff --git a/ports/libevent/CONTROL b/ports/libevent/CONTROL
index 56ca1f4c7..f260b6d01 100644
--- a/ports/libevent/CONTROL
+++ b/ports/libevent/CONTROL
@@ -1,3 +1,4 @@
 Source: libevent
-Version: 2.1.8-1
-Description: An event notification library
\ No newline at end of file
+Version: 2.1.8-3
+Build-Depends: openssl
+Description: An event notification library
diff --git a/ports/libevent/fix-target-files.patch b/ports/libevent/fix-target-files.patch
new file mode 100644
index 000000000..d1b2d5970
--- /dev/null
+++ b/ports/libevent/fix-target-files.patch
@@ -0,0 +1,36 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b4a34f3d..4bd80d84 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1343,10 +1343,10 @@ endif()
+ set(EVENT_INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Installation directory for CMake files")
+ 
+ # Make sure the paths are absolute.
+-foreach(p LIB BIN INCLUDE CMAKE)
++foreach(p INCLUDE CMAKE)
+     set(var EVENT_INSTALL_${p}_DIR)
+     if(NOT IS_ABSOLUTE "${${var}}")
+-        set(${var} "${CMAKE_INSTALL_PREFIX}/${${var}}")
++        set(${var}_FULL "${CMAKE_INSTALL_PREFIX}/${${var}}")
+     endif()
+ endforeach()
+ 
+@@ -1371,15 +1371,15 @@ configure_file(${PROJECT_SOURCE_DIR}/cmake/LibeventConfigBuildTree.cmake.in
+ # Generate the config file for the installation tree.
+ file(RELATIVE_PATH
+     REL_INCLUDE_DIR
+-    "${EVENT_INSTALL_CMAKE_DIR}"
+-    "${EVENT_INSTALL_INCLUDE_DIR}") # Calculate the relative directory from the Cmake dir.
++    "${EVENT_INSTALL_CMAKE_DIR_FULL}"
++    "${EVENT_INSTALL_INCLUDE_DIR_FULL}") # Calculate the relative directory from the Cmake dir.
+ 
+ # Note the EVENT_CMAKE_DIR is defined in LibeventConfig.cmake.in,
+ # we escape it here so it's evaluated when it is included instead
+ # so that the include dirs are givenrelative to where the
+ # config file is located.
+ set(EVENT__INCLUDE_DIRS
+-    "\${EVENT_CMAKE_DIR}/${REL_INCLUDE_DIR}")
++    "\${EVENT_CMAKE_DIR_FULL}/${REL_INCLUDE_DIR}")
+ 
+ configure_file(${PROJECT_SOURCE_DIR}/cmake/LibeventConfig.cmake.in
+                 ${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/LibeventConfig.cmake
diff --git a/ports/libevent/portfile.cmake b/ports/libevent/portfile.cmake
index ce0bc73ba..251624e3f 100644
--- a/ports/libevent/portfile.cmake
+++ b/ports/libevent/portfile.cmake
@@ -1,40 +1,39 @@
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libevent-release-2.1.8-stable)
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/libevent/libevent/archive/release-2.1.8-stable.tar.gz"
-    FILENAME "libevent-2.1.8-stable.tar.gz"
+
+if(VCPKG_CMAKE_SYSTEM_NAME MATCHES "WindowsStore")
+    message(FATAL_ERROR "libevent does not currently support UWP")
+endif()
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO libevent/libevent
+    REF release-2.1.8-stable
     SHA512 0d5c872dc797b69ab8ea4b83aebcbac20735b8c6f5adfcc2950aa4d6013d240f5fac3376e817da75ae0ccead50cec0d931619e135a050add438777457b086549
 )
-vcpkg_extract_source_archive(${ARCHIVE})
+
+vcpkg_apply_patches(
+    SOURCE_PATH ${SOURCE_PATH}
+    PATCHES
+        "${CMAKE_CURRENT_LIST_DIR}/fix-target-files.patch"
+)
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DEVENT_INSTALL_CMAKE_DIR:PATH=share/libevent
+        -DEVENT__DISABLE_BENCHMARK=ON
+        -DEVENT__DISABLE_TESTS=ON
+        -DEVENT__DISABLE_REGRESS=ON
+        -DEVENT__DISABLE_SAMPLES=ON
 )
 
 vcpkg_install_cmake()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share)
-file(RENAME ${CURRENT_PACKAGES_DIR}/cmake ${CURRENT_PACKAGES_DIR}/share/libevent)
 
-file(READ ${CURRENT_PACKAGES_DIR}/debug/cmake/LibeventTargets-debug.cmake DEBUG_MODULE)
-string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" DEBUG_MODULE "${DEBUG_MODULE}")
-string(REPLACE "${CURRENT_PACKAGES_DIR}" "\${_IMPORT_PREFIX}" DEBUG_MODULE "${DEBUG_MODULE}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/libevent/LibeventTargets-debug.cmake "${DEBUG_MODULE}")
-
-file(READ ${CURRENT_PACKAGES_DIR}/share/libevent/LibeventTargets-release.cmake RELEASE_MODULE)
-string(REPLACE "${CURRENT_PACKAGES_DIR}" "\${_IMPORT_PREFIX}" RELEASE_MODULE "${RELEASE_MODULE}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/libevent/LibeventTargets-release.cmake "${RELEASE_MODULE}")
-
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/cmake)
-
-file(READ ${CURRENT_PACKAGES_DIR}/share/libevent/LibeventConfig.cmake CONFIG_MODULE)
-string(REPLACE "${CURRENT_PACKAGES_DIR}" "\${LIBEVENT_CMAKE_DIR}/../.." CONFIG_MODULE "${CONFIG_MODULE}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/libevent/LibeventConfig.cmake "${CONFIG_MODULE}")
-file(READ ${CURRENT_PACKAGES_DIR}/share/libevent/LibeventTargets.cmake TARGETS_MODULE)
-string(REPLACE "${CURRENT_PACKAGES_DIR}" "\${LIBEVENT_CMAKE_DIR}/../.." TARGETS_MODULE "${TARGETS_MODULE}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/libevent/LibeventTargets.cmake "${TARGETS_MODULE}")
+vcpkg_fixup_cmake_targets()
+vcpkg_copy_pdbs()
 
-file(COPY ${CURRENT_BUILDTREES_DIR}/src/libevent-release-2.1.8-stable/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libevent)
+file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libevent)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/libevent/LICENSE ${CURRENT_PACKAGES_DIR}/share/libevent/copyright)
-vcpkg_copy_pdbs()