diff options
| author | Victor Romero <romerosanchezv@gmail.com> | 2019-05-02 22:57:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-02 22:57:43 -0700 |
| commit | 050e71d01dc9e65e6cdf1d13534fc14889e4ae38 (patch) | |
| tree | 7e39943693b8ac392f37d43a03c66815c6048963 /ports/caffe2 | |
| parent | b72f36e8cdd96ec482785e33f72f99cceebda8ad (diff) | |
| download | vcpkg-050e71d01dc9e65e6cdf1d13534fc14889e4ae38.tar.gz vcpkg-050e71d01dc9e65e6cdf1d13534fc14889e4ae38.zip | |
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
Diffstat (limited to 'ports/caffe2')
| -rw-r--r-- | ports/caffe2/CONTROL | 8 | ||||
| -rw-r--r-- | ports/caffe2/portfile.cmake | 10 |
2 files changed, 7 insertions, 11 deletions
diff --git a/ports/caffe2/CONTROL b/ports/caffe2/CONTROL index bbef1f62b..5cac9b00d 100644 --- a/ports/caffe2/CONTROL +++ b/ports/caffe2/CONTROL @@ -1,4 +1,4 @@ -Source: caffe2 -Version: 0.8.1-2 -Build-Depends: lmdb, gflags, glog, eigen3, protobuf -Description: Caffe2 is a lightweight, modular, and scalable deep learning framework. +Source: caffe2
+Version: 0.8.1-3
+Build-Depends: lmdb, gflags, glog, eigen3, protobuf
+Description: Caffe2 is a lightweight, modular, and scalable deep learning framework.
diff --git a/ports/caffe2/portfile.cmake b/ports/caffe2/portfile.cmake index b3e0b2978..930b04dd7 100644 --- a/ports/caffe2/portfile.cmake +++ b/ports/caffe2/portfile.cmake @@ -1,14 +1,11 @@ -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - message(STATUS "Warning: Dynamic building not supported yet. Building static.") - set(VCPKG_LIBRARY_LINKAGE static) -endif() +include(vcpkg_common_functions) + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) if (VCPKG_TARGET_ARCHITECTURE STREQUAL x86) message(FATAL_ERROR "Caffe2 cannot be built for the x86 architecture") endif() -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO caffe2/caffe2 @@ -36,7 +33,6 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -DBUILD_SHARED_LIBS=OFF # Set to ON to use python -DBUILD_PYTHON=OFF -DUSE_STATIC_RUNTIME=${USE_STATIC_RUNTIME} |