diff options
| author | Victor Romero <romerosanchezv@gmail.com> | 2019-05-02 22:57:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-02 22:57:43 -0700 |
| commit | 050e71d01dc9e65e6cdf1d13534fc14889e4ae38 (patch) | |
| tree | 7e39943693b8ac392f37d43a03c66815c6048963 /ports/qpid-proton | |
| parent | b72f36e8cdd96ec482785e33f72f99cceebda8ad (diff) | |
| download | vcpkg-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/qpid-proton')
| -rw-r--r-- | ports/qpid-proton/CONTROL | 8 | ||||
| -rw-r--r-- | ports/qpid-proton/portfile.cmake | 19 |
2 files changed, 11 insertions, 16 deletions
diff --git a/ports/qpid-proton/CONTROL b/ports/qpid-proton/CONTROL index 2c2a1f3e9..3ce196241 100644 --- a/ports/qpid-proton/CONTROL +++ b/ports/qpid-proton/CONTROL @@ -1,4 +1,4 @@ -Source: qpid-proton -Version: 0.24.0-1 -Build-Depends: openssl, libuv (osx) -Description: Qpid Proton is a high-performance, lightweight messaging library.
\ No newline at end of file +Source: qpid-proton
+Version: 0.24.0-2
+Build-Depends: openssl, libuv (osx)
+Description: Qpid Proton is a high-performance, lightweight messaging library.
diff --git a/ports/qpid-proton/portfile.cmake b/ports/qpid-proton/portfile.cmake index 64a43d431..760f74371 100644 --- a/ports/qpid-proton/portfile.cmake +++ b/ports/qpid-proton/portfile.cmake @@ -1,14 +1,7 @@ -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - message("qpid-proton does not support static linkage. Building dynamically.") - set(VCPKG_LIBRARY_LINKAGE "dynamic") -endif() - -if(VCPKG_CRT_LINKAGE STREQUAL "static") - message(FATAL_ERROR "qpid-proton does not support static CRT linkage.") -endif() - include(vcpkg_common_functions) +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) + # Use this throughout rather than literal string set(QPID_PROTON_VERSION 0.24.0) vcpkg_find_acquire_program(PYTHON2) @@ -23,9 +16,11 @@ vcpkg_from_github( ) # Run cmake configure step -vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH} - OPTIONS - -DPYTHON_EXECUTABLE=${PYTHON2}) +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DPYTHON_EXECUTABLE=${PYTHON2} +) # Run cmake install step vcpkg_install_cmake() |