aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChuong Nguyen <chuong.v.nguyen@gmail.com>2019-05-22 03:26:14 +1000
committerCurtis J Bezault <curtbezault@gmail.com>2019-05-21 10:26:14 -0700
commit85211f3ab66e15c7669a1c14a25564afcf31e2e6 (patch)
tree19c1fb7bddccb754f79bd133db3540c5c56d1446
parented612380878e8bf631e7d9f7434a75ca850f0101 (diff)
downloadvcpkg-85211f3ab66e15c7669a1c14a25564afcf31e2e6.tar.gz
vcpkg-85211f3ab66e15c7669a1c14a25564afcf31e2e6.zip
Enable to compile to a single opencv_world library file (#3914)
* Enable to compile to a single opencv_world library file
-rw-r--r--ports/opencv/CONTROL3
-rw-r--r--ports/opencv/portfile.cmake6
2 files changed, 9 insertions, 0 deletions
diff --git a/ports/opencv/CONTROL b/ports/opencv/CONTROL
index 6106a274e..8b32750b7 100644
--- a/ports/opencv/CONTROL
+++ b/ports/opencv/CONTROL
@@ -81,5 +81,8 @@ Feature: eigen
Build-Depends: eigen3
Description: Eigen support for opencv
+Feature: world
+Description: Compile to a single package support for opencv
+
Feature: nonfree
Description: allow nonfree and unredistributable libraries
diff --git a/ports/opencv/portfile.cmake b/ports/opencv/portfile.cmake
index 9ea245ed3..3df6f6b50 100644
--- a/ports/opencv/portfile.cmake
+++ b/ports/opencv/portfile.cmake
@@ -20,6 +20,11 @@ string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" BUILD_WITH_STATIC_CRT)
set(CMAKE_MODULE_PATH)
+set(BUILD_opencv_world OFF)
+if("world" IN_LIST FEATURES)
+ set(BUILD_opencv_world ON)
+endif()
+
set(BUILD_opencv_dnn OFF)
set(WITH_PROTOBUF OFF)
if("dnn" IN_LIST FEATURES)
@@ -274,6 +279,7 @@ vcpkg_configure_cmake(
-DBUILD_opencv_python3=OFF
-DBUILD_opencv_saliency=${BUILD_opencv_saliency}
-DBUILD_opencv_sfm=${BUILD_opencv_sfm}
+ -DBUILD_opencv_world=${BUILD_opencv_world}
# PROTOBUF
-DPROTOBUF_UPDATE_FILES=${PROTOBUF_UPDATE_FILES}
-DUPDATE_PROTO_FILES=${UPDATE_PROTO_FILES}