diff options
| author | Thad House <thadhouse1@gmail.com> | 2019-05-31 13:49:13 -0700 |
|---|---|---|
| committer | Thad House <thadhouse1@gmail.com> | 2019-05-31 13:49:13 -0700 |
| commit | 788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b (patch) | |
| tree | 173ade0e6960917458afe9dd9fb0c3c2b7f32051 /ports/libffi | |
| parent | f483ae4c7fd04eed671a1de595374f84175311e9 (diff) | |
| parent | 26a9338c5055193915290527eacb37f2ac7fdcb8 (diff) | |
| download | vcpkg-788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b.tar.gz vcpkg-788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b.zip | |
Merge master
Diffstat (limited to 'ports/libffi')
| -rw-r--r-- | ports/libffi/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | ports/libffi/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libffi/portfile.cmake | 5 |
3 files changed, 5 insertions, 8 deletions
diff --git a/ports/libffi/CMakeLists.txt b/ports/libffi/CMakeLists.txt index 2be7a2574..29e14bdac 100644 --- a/ports/libffi/CMakeLists.txt +++ b/ports/libffi/CMakeLists.txt @@ -50,12 +50,6 @@ include_directories(include) add_definitions(-DHAVE_CONFIG_H) add_definitions(-DFFI_BUILDING) -if(BUILD_SHARED_LIBS) - if(WIN32) - add_definitions(-DFFI_EXPORT_DATA) - endif() - set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) -endif() set(FFI_SOURCES src/x86/ffi.c diff --git a/ports/libffi/CONTROL b/ports/libffi/CONTROL index b008d7595..882d7ca94 100644 --- a/ports/libffi/CONTROL +++ b/ports/libffi/CONTROL @@ -1,3 +1,3 @@ Source: libffi
-Version: 3.1-4
+Version: 3.1-5
Description: Portable, high level programming interface to various calling conventions
diff --git a/ports/libffi/portfile.cmake b/ports/libffi/portfile.cmake index b72a6cd5a..bbb4daf83 100644 --- a/ports/libffi/portfile.cmake +++ b/ports/libffi/portfile.cmake @@ -1,8 +1,11 @@ +include(vcpkg_common_functions) + if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL x86 AND NOT VCPKG_TARGET_ARCHITECTURE STREQUAL x64) message(FATAL_ERROR "Architecture not supported") endif() -include(vcpkg_common_functions) +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libffi/libffi |