3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-28 11:21:12 +08:00
Code Issues Projects Releases Wiki Activity

[vcpkg baseline][graphviz,paraview] Fix installation order issues (#37405)

Browse Source 
devil before graphviz:
https://dev.azure.com/vcpkg/public/_build/results?buildId=100529&view=results

graphviz before paraview:
https://github.com/microsoft/vcpkg/pull/37064#issuecomment-1993637878
This commit is contained in:
Kai Pastor 2024-03-13 23:41:56 +01:00 committed by GitHub
parent 72c38122da
commit ad8f678064
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ports/graphviz/portfile.cmake
View File

@ -55,6 +55,7 @@ vcpkg_cmake_configure(
-Dwith_gvedit=OFF -Dwith_gvedit=OFF
-Dwith_smyrna=OFF -Dwith_smyrna=OFF
-DCMAKE_DISABLE_FIND_PACKAGE_ANN=ON -DCMAKE_DISABLE_FIND_PACKAGE_ANN=ON
-DCMAKE_DISABLE_FIND_PACKAGE_DevIL=ON
-DCMAKE_REQUIRE_FIND_PACKAGE_CAIRO=ON -DCMAKE_REQUIRE_FIND_PACKAGE_CAIRO=ON
-DCMAKE_REQUIRE_FIND_PACKAGE_EXPAT=ON -DCMAKE_REQUIRE_FIND_PACKAGE_EXPAT=ON
-DCMAKE_REQUIRE_FIND_PACKAGE_GD=ON -DCMAKE_REQUIRE_FIND_PACKAGE_GD=ON

1
ports/graphviz/vcpkg.json
View File

@ -1,6 +1,7 @@
{ {
"name": "graphviz", "name": "graphviz",
"version-semver": "10.0.1", "version-semver": "10.0.1",
"port-version": 1,
"description": "Graph Visualization Tools", "description": "Graph Visualization Tools",
"homepage": "https://graphviz.org/", "homepage": "https://graphviz.org/",
"license": "EPL-1.0", "license": "EPL-1.0",

1
ports/paraview/portfile.cmake
View File

@ -107,6 +107,7 @@ vcpkg_cmake_configure(
${ADDITIONAL_OPTIONS} ${ADDITIONAL_OPTIONS}
#-DPARAVIEW_ENABLE_FFMPEG:BOOL=OFF #-DPARAVIEW_ENABLE_FFMPEG:BOOL=OFF
-DCMAKE_DISABLE_FIND_PACKAGE_Graphviz=ON
) )
if(CMAKE_HOST_UNIX) if(CMAKE_HOST_UNIX)
# ParaView runs Qt tools so LD_LIBRARY_PATH must be set correctly for them to find *.so files # ParaView runs Qt tools so LD_LIBRARY_PATH must be set correctly for them to find *.so files

2
ports/paraview/vcpkg.json
View File

@ -1,7 +1,7 @@
{ {
"name": "paraview", "name": "paraview",
"version": "5.11.0", "version": "5.11.0",
"port-version": 4, "port-version": 5,
"description": "VTK-based Data Analysis and Visualization Application", "description": "VTK-based Data Analysis and Visualization Application",
"homepage": "https://www.paraview.org/", "homepage": "https://www.paraview.org/",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",

4
versions/baseline.json
View File

@ -3162,7 +3162,7 @@
}, },
"graphviz": { "graphviz": {
"baseline": "10.0.1", "baseline": "10.0.1",
"port-version": 0 "port-version": 1
}, },
"greatest": { "greatest": {
"baseline": "1.5.0", "baseline": "1.5.0",
@ -6618,7 +6618,7 @@
}, },
"paraview": { "paraview": {
"baseline": "5.11.0", "baseline": "5.11.0",
"port-version": 4 "port-version": 5
}, },
"parmetis": { "parmetis": {
"baseline": "2022-07-27", "baseline": "2022-07-27",

5
versions/g-/graphviz.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "a91bdf5090ac2d8f9153475cf94e2df03a40c31b",
"version-semver": "10.0.1",
"port-version": 1
},
{ {
"git-tree": "efcf0cb433b9d901fd6aeb10a85f674352373e6f", "git-tree": "efcf0cb433b9d901fd6aeb10a85f674352373e6f",
"version-semver": "10.0.1", "version-semver": "10.0.1",

5
versions/p-/paraview.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "2dbdde07d29c13b69e83fb0a022568b3c20c4b4c",
"version": "5.11.0",
"port-version": 5
},
{ {
"git-tree": "2aa3d8185a319a76c7961608ecce8b2f03c08cd7", "git-tree": "2aa3d8185a319a76c7961608ecce8b2f03c08cd7",
"version": "5.11.0", "version": "5.11.0",