diff options
| author | Tobias Kohlbau <tobias@kohlbau.de> | 2017-03-28 10:48:26 +0200 |
|---|---|---|
| committer | Tobias Kohlbau <tobias@kohlbau.de> | 2017-03-28 10:51:53 +0200 |
| commit | a9aaead2d19c60a51edbaaddd97b745c51714220 (patch) | |
| tree | e0632fa068b11edd4be13e1ee191d65616a4cffb /ports/opencv | |
| parent | 4fbcf0df4dd14176eda7d686bf122d0b65c0585a (diff) | |
| parent | a1cfa18481f9ea0f7eaaaeb34832d89c51f5f4f1 (diff) | |
| download | vcpkg-a9aaead2d19c60a51edbaaddd97b745c51714220.tar.gz vcpkg-a9aaead2d19c60a51edbaaddd97b745c51714220.zip | |
Merge branch 'master' of github.com:Microsoft/vcpkg into opencv_contrib
Diffstat (limited to 'ports/opencv')
| -rw-r--r-- | ports/opencv/open_contrib-remove-waldboost.patch | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/ports/opencv/open_contrib-remove-waldboost.patch b/ports/opencv/open_contrib-remove-waldboost.patch index f8e52d3fc..6c4da30ae 100644 --- a/ports/opencv/open_contrib-remove-waldboost.patch +++ b/ports/opencv/open_contrib-remove-waldboost.patch @@ -1,12 +1,3 @@ -From 1721a0f7ff75176e9a9f0e04dc11f1a5d5c0f550 Mon Sep 17 00:00:00 2001 -From: Tobias Kohlbau <tobias.kohlbau@etit.tu-chemnitz.de> -Date: Mon, 27 Mar 2017 14:53:47 +0200 -Subject: [PATCH] removes waldboost_detector binary - ---- - modules/xobjdetect/CMakeLists.txt | 3 --- - 1 file changed, 3 deletions(-) - diff --git a/modules/xobjdetect/CMakeLists.txt b/modules/xobjdetect/CMakeLists.txt index 567909b..2f30b41 100644 --- a/modules/xobjdetect/CMakeLists.txt @@ -17,6 +8,6 @@ index 567909b..2f30b41 100644 -if (NOT APPLE_FRAMEWORK) - add_subdirectory(tools) -endif() --- +-- 2.12.0.windows.1 |