aboutsummaryrefslogtreecommitdiff
path: root/ports/wangle
diff options
context:
space:
mode:
authorVictor Romero <romerosanchezv@gmail.com>2019-05-02 22:57:43 -0700
committerGitHub <noreply@github.com>2019-05-02 22:57:43 -0700
commit050e71d01dc9e65e6cdf1d13534fc14889e4ae38 (patch)
tree7e39943693b8ac392f37d43a03c66815c6048963 /ports/wangle
parentb72f36e8cdd96ec482785e33f72f99cceebda8ad (diff)
downloadvcpkg-050e71d01dc9e65e6cdf1d13534fc14889e4ae38.tar.gz
vcpkg-050e71d01dc9e65e6cdf1d13534fc14889e4ae38.zip
Remove references to CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS (#5937)
* [various ports] remove references to CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS * [alac,benchmark,capnproto] Fix check_linkage call * [fastlz] Fix SHA512 * [coroutine] Fix dynamic build * [folly] Find double-conversion * [gamma] Use vcpkg_from_github * [librsync] Enable static builds * [netcdf-cxx4] Fix SHA512 * [octomap] Fix static build * [tidy-html5] Fix static build * [various ports] remove custom messages for shared/static builds, modernize some scripts in the meantime * [folly] Use ras0219's fix for link paths * [octomap] Fix exported targets * [uvatlas] Set tool download SHA512 * [duktape+python2] fix portfile to call configure with correct python version, manage python2 also outside win32 * [suitesparse] osx fix * [gtkmm] Call vcpkg_check_linkage after including vcpkg functions * [duktape] Resolve conflicts * [duktape] FIxed typo in Python paths * [wangle] Find zlib * [openssl-uwp] Fix SHA512 * [glib] Allow static builds on non-Windows * [suitesparse] Fix build on Windows * [multiple ports] Bump CONTROL version * [multiple ports] Fix description indent * [directxtk] Fix CONTROL file * [bde,duktape,qpid-proton] Build packages with python2 installed * [binn] remove CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS * [gdal,live555,uriparser] Fix regressions * [live555] Update to 2019.04.24
Diffstat (limited to 'ports/wangle')
-rw-r--r--ports/wangle/CONTROL2
-rw-r--r--ports/wangle/build.patch53
-rw-r--r--ports/wangle/portfile.cmake3
3 files changed, 31 insertions, 27 deletions
diff --git a/ports/wangle/CONTROL b/ports/wangle/CONTROL
index 77df9ccf0..9b1b4d3e0 100644
--- a/ports/wangle/CONTROL
+++ b/ports/wangle/CONTROL
@@ -1,4 +1,4 @@
Source: wangle
-Version: 2019.01.07.00-1
+Version: 2019.01.07.00-2
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
index d695f5b18..3a7698218 100644
--- a/ports/wangle/build.patch
+++ b/ports/wangle/build.patch
@@ -1,25 +1,28 @@
-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/wangle/CMakeLists.txt b/wangle/CMakeLists.txt
+index dd348b0..4e84a15 100644
+--- a/wangle/CMakeLists.txt
++++ b/wangle/CMakeLists.txt
+@@ -39,11 +39,12 @@ 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)
++find_package(ZLIB REQUIRED)
+ if (UNIX AND NOT APPLE)
+ find_package(Librt)
+ endif()
+@@ -124,6 +125,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/portfile.cmake b/ports/wangle/portfile.cmake
index ce1672eb7..b9761c633 100644
--- a/ports/wangle/portfile.cmake
+++ b/ports/wangle/portfile.cmake
@@ -5,7 +5,7 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/wangle
- REF v2019.01.07.00
+ REF v2019.01.07.00
SHA512 1b4771d92b45fd5e9622985321cfd608510ea13d2f4cb03a4842c52d7253a1b460f825746a315ef0df3b2e37e56abddb5b493b80d383ba327fdbf7294bae193e
HEAD_REF master
PATCHES
@@ -13,6 +13,7 @@ vcpkg_from_github(
gflags.patch
fix-config-cmake.patch
)
+# message(FATAL_ERROR "patch")
vcpkg_configure_cmake(
SOURCE_PATH "${SOURCE_PATH}/wangle"