aboutsummaryrefslogtreecommitdiff
path: root/ports/qpid-proton
diff options
context:
space:
mode:
Diffstat (limited to 'ports/qpid-proton')
-rw-r--r--ports/qpid-proton/CONTROL8
-rw-r--r--ports/qpid-proton/portfile.cmake19
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()