From 050e71d01dc9e65e6cdf1d13534fc14889e4ae38 Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Thu, 2 May 2019 22:57:43 -0700 Subject: 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 --- ports/cppfs/CONTROL | 14 +++++++------- ports/cppfs/portfile.cmake | 8 +------- 2 files changed, 8 insertions(+), 14 deletions(-) (limited to 'ports/cppfs') 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 ) -- cgit v1.2.3