diff options
| author | John Spaith <jspaith@windows.microsoft.com> | 2019-10-10 09:36:18 -0700 |
|---|---|---|
| committer | John Spaith <jspaith@windows.microsoft.com> | 2019-10-10 09:36:18 -0700 |
| commit | 17c9b6bac8270b9740e5d824c6ebfff6cc7d5ed1 (patch) | |
| tree | 7baa6f699aa57601dbba4ace876fad45958878fc /ports/libevent | |
| parent | 1d4189d1dde0fa8bbcbc6237cc33b85bca0512e1 (diff) | |
| parent | 2b049c47b5b2e003f8bcfe6707d4b0eaf8d1b569 (diff) | |
| download | vcpkg-17c9b6bac8270b9740e5d824c6ebfff6cc7d5ed1.tar.gz vcpkg-17c9b6bac8270b9740e5d824c6ebfff6cc7d5ed1.zip | |
Merge from master
Diffstat (limited to 'ports/libevent')
| -rw-r--r-- | ports/libevent/fix-crt_linkage.patch | 13 | ||||
| -rw-r--r-- | ports/libevent/portfile.cmake | 2 |
2 files changed, 15 insertions, 0 deletions
diff --git a/ports/libevent/fix-crt_linkage.patch b/ports/libevent/fix-crt_linkage.patch new file mode 100644 index 000000000..b766b4556 --- /dev/null +++ b/ports/libevent/fix-crt_linkage.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bf333f3..5bc2a54 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -230,7 +230,7 @@ endif() + + if (${MSVC}) + set(msvc_static_runtime OFF) +- if ("${EVENT_LIBRARY_TYPE}" STREQUAL "STATIC") ++ if ("${VCPKG_CRT_LINKAGE}" STREQUAL "STATIC") + set(msvc_static_runtime ON) + endif() + diff --git a/ports/libevent/portfile.cmake b/ports/libevent/portfile.cmake index 91c915b92..1ce0ab450 100644 --- a/ports/libevent/portfile.cmake +++ b/ports/libevent/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_from_github( SHA512 a34ca4ad4d55a989a4f485f929d0ed2438d070d0e12a19d90c2b12783a562419c64db6a2603b093d958a75246d14ffefc8730c69c90b1b2f48339bde947f0e02 PATCHES fix-file_path.patch + fix-crt_linkage.patch ) if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") @@ -25,6 +26,7 @@ vcpkg_configure_cmake( OPTIONS -DEVENT_INSTALL_CMAKE_DIR:PATH=share/libevent -DEVENT__LIBRARY_TYPE=${LIBEVENT_LIB_TYPE} + -DVCPKG_CRT_LINKAGE=${VCPKG_CRT_LINKAGE} -DEVENT__DISABLE_BENCHMARK=ON -DEVENT__DISABLE_TESTS=ON -DEVENT__DISABLE_REGRESS=ON |