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/cppfs | |
| parent | f483ae4c7fd04eed671a1de595374f84175311e9 (diff) | |
| parent | 26a9338c5055193915290527eacb37f2ac7fdcb8 (diff) | |
| download | vcpkg-788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b.tar.gz vcpkg-788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b.zip | |
Merge master
Diffstat (limited to 'ports/cppfs')
| -rw-r--r-- | ports/cppfs/CONTROL | 14 | ||||
| -rw-r--r-- | ports/cppfs/portfile.cmake | 8 |
2 files changed, 8 insertions, 14 deletions
diff --git a/ports/cppfs/CONTROL b/ports/cppfs/CONTROL index 30ec75f00..d94532e8a 100644 --- a/ports/cppfs/CONTROL +++ b/ports/cppfs/CONTROL @@ -1,7 +1,7 @@ -Source: cppfs -Version: 1.2.0 -Description: Cross-platform C++ file system library supporting multiple backends - -Feature: ssh -Description: SSH backend for cppfs -Build-Depends: libssh2,openssl,zlib +Source: cppfs
+Version: 1.2.0-1
+Description: Cross-platform C++ file system library supporting multiple backends
+
+Feature: ssh
+Description: SSH backend for cppfs
+Build-Depends: libssh2,openssl,zlib
diff --git a/ports/cppfs/portfile.cmake b/ports/cppfs/portfile.cmake index 33ea7e605..b108c5574 100644 --- a/ports/cppfs/portfile.cmake +++ b/ports/cppfs/portfile.cmake @@ -15,11 +15,6 @@ if(${TARGET_TRIPLET} MATCHES "uwp") message(FATAL_ERROR "cppfs does not support uwp") endif() -set(SHARED_LIBS Off) -if(${VCPKG_LIBRARY_LINKAGE} STREQUAL "dynamic") - set(SHARED_LIBS On) -endif() - set(SSH_BACKEND OFF) if("ssh" IN_LIST FEATURES) set(SSH_BACKEND ON) @@ -31,10 +26,9 @@ endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS + OPTIONS -DOPTION_BUILD_SSH_BACKEND=${SSH_BACKEND} -DOPTION_BUILD_TESTS=Off - -DBUILD_SHARED_LIBS=${SHARED_LIBS} -DOPTION_FORCE_SYSTEM_DIR_INSTALL=On ) |