aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhoebe <20694052+PhoebeHui@users.noreply.github.com>2021-04-14 06:19:33 +0800
committerGitHub <noreply@github.com>2021-04-13 15:19:33 -0700
commitf44fb85b341b8f58815b95c84d8488126b251570 (patch)
treef143941ec810589f1d8a33e903c25f723e0b7366
parent40449ff1cb76570f93dd7b2892859f18e60289f0 (diff)
downloadvcpkg-f44fb85b341b8f58815b95c84d8488126b251570.tar.gz
vcpkg-f44fb85b341b8f58815b95c84d8488126b251570.zip
[vcpkg baseline][pangolin] Set CMAKE_DISABLE_FIND_PACKAGE_XX to ON (#17250)
* [vcpkg baseline][pangolin] Set CMAKE_DISABLE_FIND_PACKAGE_XX to ON * Update baseline version
-rw-r--r--ports/pangolin/portfile.cmake24
-rw-r--r--ports/pangolin/vcpkg.json2
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/p-/pangolin.json5
4 files changed, 19 insertions, 14 deletions
diff --git a/ports/pangolin/portfile.cmake b/ports/pangolin/portfile.cmake
index 452aaf771..b6b8837f9 100644
--- a/ports/pangolin/portfile.cmake
+++ b/ports/pangolin/portfile.cmake
@@ -28,18 +28,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
+ -DCMAKE_DISABLE_FIND_PACKAGE_PythonLibs=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_TooN=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_DC1394=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_LibRealSense=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_OpenNI=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_OpenNI2=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_uvc=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_DepthSense=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_TeliCam=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_Pleora=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_TIFF=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_OpenEXR=ON
-DMSVC_USE_STATIC_CRT=${MSVC_USE_STATIC_CRT}
)
diff --git a/ports/pangolin/vcpkg.json b/ports/pangolin/vcpkg.json
index cd138bfff..94864e848 100644
--- a/ports/pangolin/vcpkg.json
+++ b/ports/pangolin/vcpkg.json
@@ -1,7 +1,7 @@
{
"name": "pangolin",
"version-string": "0.5",
- "port-version": 14,
+ "port-version": 15,
"description": "Lightweight GUI Library",
"homepage": "https://github.com/stevenlovegrove/Pangolin",
"supports": "!uwp & !osx",
diff --git a/versions/baseline.json b/versions/baseline.json
index 6de4dd162..8ec59ecb7 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4622,7 +4622,7 @@
},
"pangolin": {
"baseline": "0.5",
- "port-version": 14
+ "port-version": 15
},
"pangomm": {
"baseline": "2.40.1",
diff --git a/versions/p-/pangolin.json b/versions/p-/pangolin.json
index 0569731e8..aad761058 100644
--- a/versions/p-/pangolin.json
+++ b/versions/p-/pangolin.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "77d0735cc19bbb45a0212a8b15ea101ca3598219",
+ "version-string": "0.5",
+ "port-version": 15
+ },
+ {
"git-tree": "b93d201ff49c7b409349f6322d8f23cb630da0e5",
"version-string": "0.5",
"port-version": 14