Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/philc/3425

4 files changed, 97 insertions, 0 deletions

diff --git a/ports/wangle/CONTROL b/ports/wangle/CONTROL
new file mode 100644
index 000000000..b7d4dcd17
--- /dev/null
+++ b/ports/wangle/CONTROL
@@ -0,0 +1,4 @@
+Source: wangle

+Version: 2018.11.05.00
+Build-Depends: fizz, folly, openssl, gtest, glog, libevent, double-conversion

+Description: Wangle is a framework providing a set of common client/server abstractions for building services in a consistent, modular, and composable way.

diff --git a/ports/wangle/build.patch b/ports/wangle/build.patch
new file mode 100644
index 000000000..d695f5b18
--- /dev/null
+++ b/ports/wangle/build.patch
@@ -0,0 +1,25 @@
+diff --git a/wangle/CMakeLists.txt b/wangle/CMakeLists.txt

+index 15dc8b6..ed8c79b 100644

+--- a/wangle/CMakeLists.txt

++++ b/wangle/CMakeLists.txt

+@@ -39,9 +39,9 @@ endif()

+ find_package(fizz CONFIG REQUIRED)

+ find_package(Boost REQUIRED COMPONENTS system thread filesystem regex context)

+ find_package(OpenSSL REQUIRED)

+-find_package(Glog REQUIRED)

+-find_package(Gflags REQUIRED)

+-find_package(Libevent REQUIRED)

++find_package(Glog CONFIG REQUIRED)

++find_package(Gflags CONFIG REQUIRED)

++find_package(Libevent CONFIG REQUIRED)

+ find_package(DoubleConversion REQUIRED)

+ find_package(Threads REQUIRED)

+ if (UNIX AND NOT APPLE)

+@@ -123,6 +123,7 @@ target_include_directories(

+   PUBLIC

+     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/..>

+     $<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>

++  PRIVATE

+     ${FIZZ_INCLUDE_DIR}

+     ${FOLLY_INCLUDE_DIR}

+     ${Boost_INCLUDE_DIR}

diff --git a/ports/wangle/gflags.patch b/ports/wangle/gflags.patch
new file mode 100644
index 000000000..20921c72c
--- /dev/null
+++ b/ports/wangle/gflags.patch
@@ -0,0 +1,31 @@
+diff --git a/wangle/cmake/FindGflags.cmake b/wangle/cmake/FindGflags.cmake

+index 0243aa3..be3780f 100644

+--- a/wangle/cmake/FindGflags.cmake

++++ b/wangle/cmake/FindGflags.cmake

+@@ -7,19 +7,11 @@

+ 

+ include(FindPackageHandleStandardArgs)

+ 

+-find_library(GFLAGS_LIBRARY gflags

+-  PATHS ${GFLAGS_LIBRARYDIR})

++find_package(gflags CONFIG REQUIRED)

+ 

+-find_path(GFLAGS_INCLUDE_DIR gflags/gflags.h

+-  PATHS ${GFLAGS_INCLUDEDIR})

+-

+-find_package_handle_standard_args(gflags DEFAULT_MSG

+-  GFLAGS_LIBRARY

+-  GFLAGS_INCLUDE_DIR)

+-

+-mark_as_advanced(

+-  GFLAGS_LIBRARY

+-  GFLAGS_INCLUDE_DIR)

+-

+-set(GFLAGS_LIBRARIES ${GFLAGS_LIBRARY})

+-set(GFLAGS_INCLUDE_DIRS ${GFLAGS_INCLUDE_DIR})

++if(TARGET gflags_static)

++  set(GFLAGS_LIBRARIES gflags_static)

++else()

++  set(GFLAGS_LIBRARIES gflags_shared)

++endif()

++set(GFLAGS_INCLUDE_DIRS)

diff --git a/ports/wangle/portfile.cmake b/ports/wangle/portfile.cmake
new file mode 100644
index 000000000..5f17212c9
--- /dev/null
+++ b/ports/wangle/portfile.cmake
@@ -0,0 +1,37 @@
+include(vcpkg_common_functions)

+

+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)

+

+vcpkg_from_github(

+    OUT_SOURCE_PATH SOURCE_PATH

+    REPO facebook/wangle

+    REF v2018.11.05.00
+    SHA512 287fd19e352f04666d2d925eb6322aa5b74b1b8808142d37c1089b34df650bc56f0489ff4746b1ddfbec7544d99df71f9583d47ef5abef600e9bc5d434dceab6

+    HEAD_REF master

+    PATCHES

+        build.patch

+        gflags.patch

+)

+

+vcpkg_configure_cmake(

+    SOURCE_PATH "${SOURCE_PATH}/wangle"

+    PREFER_NINJA

+    OPTIONS

+        -DBUILD_TESTS=OFF

+        -DINCLUDE_INSTALL_DIR:STRING=include

+)

+

+vcpkg_install_cmake()

+vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/wangle")

+vcpkg_copy_pdbs()

+

+file(REMOVE_RECURSE 

+    ${CURRENT_PACKAGES_DIR}/debug/include

+    ${CURRENT_PACKAGES_DIR}/include/wangle/util/test

+    ${CURRENT_PACKAGES_DIR}/include/wangle/ssl/test/certs

+    ${CURRENT_PACKAGES_DIR}/include/wangle/service/test

+    ${CURRENT_PACKAGES_DIR}/include/wangle/deprecated/rx/test

+)

+

+# Handle copyright

+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/wangle RENAME copyright)