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

1 files changed, 9 insertions, 38 deletions

diff --git a/ports/wangle/build.patch b/ports/wangle/build.patch
index fce998fed..d695f5b18 100644
--- a/ports/wangle/build.patch
+++ b/ports/wangle/build.patch
@@ -1,9 +1,9 @@
 diff --git a/wangle/CMakeLists.txt b/wangle/CMakeLists.txt

-index 0302249..3bf1e6c 100644

+index 15dc8b6..ed8c79b 100644

 --- a/wangle/CMakeLists.txt

 +++ b/wangle/CMakeLists.txt

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

- 

+@@ -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)

@@ -15,40 +15,11 @@ index 0302249..3bf1e6c 100644
  find_package(DoubleConversion REQUIRED)

  find_package(Threads REQUIRED)

  if (UNIX AND NOT APPLE)

-@@ -116,11 +116,9 @@ if (BUILD_SHARED_LIBS)

-     PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION 1)

- endif()

- 

--target_include_directories(

--  wangle

--  PUBLIC

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

--    $<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>

-+include_directories(

-+   "${CMAKE_SOURCE_DIR}/.."

-+   ${INCLUDE_INSTALL_DIR}

+@@ -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}

-     ${OPENSSL_INCLUDE_DIR}

-@@ -143,15 +141,19 @@ target_link_libraries(wangle PUBLIC

- install(

-   TARGETS wangle

-   EXPORT wangle-exports

--  DESTINATION ${LIB_INSTALL_DIR}

-+  RUNTIME DESTINATION bin

-+  LIBRARY DESTINATION lib

-+  ARCHIVE DESTINATION lib

- )

- # We unfortunately cannot install wangle's headers with the install()

- # statement above.  install(TARGETS) appears to only support installing

- # PUBLIC_HEADER in a flat include directory, and not a deeper tree.

-+if(NOT DISABLE_INSTALL_HEADERS)

- foreach(dir ${WANGLE_HEADER_DIRS})

--  install(DIRECTORY ${dir} DESTINATION "${INCLUDE_INSTALL_DIR}/wangle"

-+  install(DIRECTORY ${dir} DESTINATION "include/wangle"

-           FILES_MATCHING PATTERN "*.h")

- endforeach()

-+endif()

- 

- # Install CMake package configuration files for wangle

- include(CMakePackageConfigHelpers)