diff options
| author | LarryIII <33021067+LarryIII@users.noreply.github.com> | 2019-03-27 22:02:31 -0700 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-03-27 22:02:31 -0700 |
| commit | 78a8de6cf468dc3d3301b26fedae7969bb366a75 (patch) | |
| tree | 07e482b1da0c6bdc1d2ee6d215155802094408a7 /ports/caffe2 | |
| parent | 493b76284dd0b075ac9486be6c9bd60af105bd3b (diff) | |
| download | vcpkg-78a8de6cf468dc3d3301b26fedae7969bb366a75.tar.gz vcpkg-78a8de6cf468dc3d3301b26fedae7969bb366a75.zip | |
[pcre2/caffe2] Fix space issue (#5827)
* [pcre2/caffe2] Fix space issue
Diffstat (limited to 'ports/caffe2')
| -rw-r--r-- | ports/caffe2/CONTROL | 2 | ||||
| -rw-r--r-- | ports/caffe2/fix-space.patch | 13 | ||||
| -rw-r--r-- | ports/caffe2/portfile.cmake | 3 |
3 files changed, 16 insertions, 2 deletions
diff --git a/ports/caffe2/CONTROL b/ports/caffe2/CONTROL index 2f40d9825..bbef1f62b 100644 --- a/ports/caffe2/CONTROL +++ b/ports/caffe2/CONTROL @@ -1,4 +1,4 @@ Source: caffe2 -Version: 0.8.1-1 +Version: 0.8.1-2 Build-Depends: lmdb, gflags, glog, eigen3, protobuf Description: Caffe2 is a lightweight, modular, and scalable deep learning framework. diff --git a/ports/caffe2/fix-space.patch b/ports/caffe2/fix-space.patch new file mode 100644 index 000000000..910f52f9c --- /dev/null +++ b/ports/caffe2/fix-space.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake
+index e082298..25186e4 100644
+--- a/cmake/Utils.cmake
++++ b/cmake/Utils.cmake
+@@ -386,7 +386,7 @@ function(caffe_add_whole_archive_flag lib output_var)
+ set(${output_var} -Wl,-force_load,$<TARGET_FILE:${lib}> PARENT_SCOPE)
+ elseif(MSVC)
+ # In MSVC, we will add whole archive in default.
+- set(${output_var} -WHOLEARCHIVE:$<TARGET_FILE:${lib}> PARENT_SCOPE)
++ set(${output_var} -WHOLEARCHIVE:"$<TARGET_FILE:${lib}>" PARENT_SCOPE)
+ else()
+ # Assume everything else is like gcc
+ set(${output_var} -Wl,--whole-archive ${lib} -Wl,--no-whole-archive PARENT_SCOPE)
diff --git a/ports/caffe2/portfile.cmake b/ports/caffe2/portfile.cmake index 41abd403e..b3e0b2978 100644 --- a/ports/caffe2/portfile.cmake +++ b/ports/caffe2/portfile.cmake @@ -16,7 +16,8 @@ vcpkg_from_github( SHA512 505a8540b0c28329c4e2ce443ac8e198c1ee613eb6b932927ee9d04c8afdc95081f3c4581408b7097d567840427b31f6d7626ea80f27e56532f2f2e6acd87023 HEAD_REF master PATCHES - ${CMAKE_CURRENT_LIST_DIR}/msvc-fixes.patch + msvc-fixes.patch + fix-space.patch ) if(VCPKG_CRT_LINKAGE STREQUAL static) |