aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>2021-04-02 01:07:01 +0800
committerGitHub <noreply@github.com>2021-04-01 10:07:01 -0700
commit7d40a546b87572e81c2d37f9aae6d4cd99bb9aaa (patch)
tree24fa4b465b313e91dd93ed569ec0a140d2e80cd2
parent338964e3ffd130f094c98f07ccbbb53578f8d633 (diff)
downloadvcpkg-7d40a546b87572e81c2d37f9aae6d4cd99bb9aaa.tar.gz
vcpkg-7d40a546b87572e81c2d37f9aae6d4cd99bb9aaa.zip
[vcpkg baseline][pangolin] Add options to dependencies to avoid finding them automatically (#17014)
* [vcpkg baseline][pangolin] Add options to dependencies to avoid finding them automatically * update version record * switch to CMAKE_DISABLE_FIND_PACKAGE_PORT * bump version
-rw-r--r--ports/pangolin/CONTROL7
-rw-r--r--ports/pangolin/portfile.cmake12
-rw-r--r--ports/pangolin/vcpkg.json20
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/p-/pangolin.json5
5 files changed, 38 insertions, 8 deletions
diff --git a/ports/pangolin/CONTROL b/ports/pangolin/CONTROL
deleted file mode 100644
index 7d29b2e2d..000000000
--- a/ports/pangolin/CONTROL
+++ /dev/null
@@ -1,7 +0,0 @@
-Source: pangolin
-Version: 0.5
-Port-Version: 12
-Build-Depends: eigen3, glew, libpng, libjpeg-turbo, ffmpeg[avformat]
-Homepage: https://github.com/stevenlovegrove/Pangolin
-Description: Lightweight GUI Library
-Supports: !uwp & !osx
diff --git a/ports/pangolin/portfile.cmake b/ports/pangolin/portfile.cmake
index 303e697b4..df9c5bad8 100644
--- a/ports/pangolin/portfile.cmake
+++ b/ports/pangolin/portfile.cmake
@@ -27,6 +27,18 @@ vcpkg_configure_cmake(
-DBUILD_EXTERN_GLEW=OFF
-DBUILD_EXTERN_LIBPNG=OFF
-DBUILD_EXTERN_LIBJPEG=OFF
+ -DCMAKE_DISABLE_FIND_PACKAGE_PythonLibs=OFF
+ -DCMAKE_DISABLE_FIND_PACKAGE_TooN=OFF
+ -DCMAKE_DISABLE_FIND_PACKAGE_DC1394=OFF
+ -DCMAKE_DISABLE_FIND_PACKAGE_LibRealSense=OFF
+ -DCMAKE_DISABLE_FIND_PACKAGE_OpenNI=OFF
+ -DCMAKE_DISABLE_FIND_PACKAGE_OpenNI2=OFF
+ -DCMAKE_DISABLE_FIND_PACKAGE_uvc=OFF
+ -DCMAKE_DISABLE_FIND_PACKAGE_DepthSense=OFF
+ -DCMAKE_DISABLE_FIND_PACKAGE_TeliCam=OFF
+ -DCMAKE_DISABLE_FIND_PACKAGE_Pleora=OFF
+ -DCMAKE_DISABLE_FIND_PACKAGE_TIFF=OFF
+ -DCMAKE_DISABLE_FIND_PACKAGE_OpenEXR=OFF
-DMSVC_USE_STATIC_CRT=${MSVC_USE_STATIC_CRT}
)
diff --git a/ports/pangolin/vcpkg.json b/ports/pangolin/vcpkg.json
new file mode 100644
index 000000000..32b6ba796
--- /dev/null
+++ b/ports/pangolin/vcpkg.json
@@ -0,0 +1,20 @@
+{
+ "name": "pangolin",
+ "version-string": "0.5",
+ "port-version": 13,
+ "description": "Lightweight GUI Library",
+ "homepage": "https://github.com/stevenlovegrove/Pangolin",
+ "supports": "!uwp & !osx",
+ "dependencies": [
+ "eigen3",
+ {
+ "name": "ffmpeg",
+ "features": [
+ "avformat"
+ ]
+ },
+ "glew",
+ "libjpeg-turbo",
+ "libpng"
+ ]
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index f3f1a8f1b..409aece97 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4594,7 +4594,7 @@
},
"pangolin": {
"baseline": "0.5",
- "port-version": 12
+ "port-version": 13
},
"pangomm": {
"baseline": "2.40.1",
diff --git a/versions/p-/pangolin.json b/versions/p-/pangolin.json
index dabe35abe..0b309bc7d 100644
--- a/versions/p-/pangolin.json
+++ b/versions/p-/pangolin.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "e746f01a619539fbbb0aae9b0edb9df733e555d7",
+ "version-string": "0.5",
+ "port-version": 13
+ },
+ {
"git-tree": "a27ee268db34edfd09ce5d0b51e574c7e6719931",
"version-string": "0.5",
"port-version": 12