From ad8f67806431176e6917c3b5af30665a66c4019d Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 13 Mar 2024 23:41:56 +0100 Subject: [PATCH] [vcpkg baseline][graphviz,paraview] Fix installation order issues (#37405) 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 --- ports/graphviz/portfile.cmake | 1 + ports/graphviz/vcpkg.json | 1 + ports/paraview/portfile.cmake | 1 + ports/paraview/vcpkg.json | 2 +- versions/baseline.json | 4 ++-- versions/g-/graphviz.json | 5 +++++ versions/p-/paraview.json | 5 +++++ 7 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ports/graphviz/portfile.cmake b/ports/graphviz/portfile.cmake index 900c6f2b33..f8efb6335b 100644 --- a/ports/graphviz/portfile.cmake +++ b/ports/graphviz/portfile.cmake @@ -55,6 +55,7 @@ vcpkg_cmake_configure( -Dwith_gvedit=OFF -Dwith_smyrna=OFF -DCMAKE_DISABLE_FIND_PACKAGE_ANN=ON + -DCMAKE_DISABLE_FIND_PACKAGE_DevIL=ON -DCMAKE_REQUIRE_FIND_PACKAGE_CAIRO=ON -DCMAKE_REQUIRE_FIND_PACKAGE_EXPAT=ON -DCMAKE_REQUIRE_FIND_PACKAGE_GD=ON diff --git a/ports/graphviz/vcpkg.json b/ports/graphviz/vcpkg.json index f3fe42d6fe..13c643aa5b 100644 --- a/ports/graphviz/vcpkg.json +++ b/ports/graphviz/vcpkg.json @@ -1,6 +1,7 @@ { "name": "graphviz", "version-semver": "10.0.1", + "port-version": 1, "description": "Graph Visualization Tools", "homepage": "https://graphviz.org/", "license": "EPL-1.0", diff --git a/ports/paraview/portfile.cmake b/ports/paraview/portfile.cmake index 189311d7fe..737b865855 100644 --- a/ports/paraview/portfile.cmake +++ b/ports/paraview/portfile.cmake @@ -107,6 +107,7 @@ vcpkg_cmake_configure( ${ADDITIONAL_OPTIONS} #-DPARAVIEW_ENABLE_FFMPEG:BOOL=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_Graphviz=ON ) if(CMAKE_HOST_UNIX) # ParaView runs Qt tools so LD_LIBRARY_PATH must be set correctly for them to find *.so files diff --git a/ports/paraview/vcpkg.json b/ports/paraview/vcpkg.json index 2292f60c9d..e09ec8f134 100644 --- a/ports/paraview/vcpkg.json +++ b/ports/paraview/vcpkg.json @@ -1,7 +1,7 @@ { "name": "paraview", "version": "5.11.0", - "port-version": 4, + "port-version": 5, "description": "VTK-based Data Analysis and Visualization Application", "homepage": "https://www.paraview.org/", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index a319aa059c..c1c3610f08 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3162,7 +3162,7 @@ }, "graphviz": { "baseline": "10.0.1", - "port-version": 0 + "port-version": 1 }, "greatest": { "baseline": "1.5.0", @@ -6618,7 +6618,7 @@ }, "paraview": { "baseline": "5.11.0", - "port-version": 4 + "port-version": 5 }, "parmetis": { "baseline": "2022-07-27", diff --git a/versions/g-/graphviz.json b/versions/g-/graphviz.json index 79f70c6892..0cf4fb978a 100644 --- a/versions/g-/graphviz.json +++ b/versions/g-/graphviz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a91bdf5090ac2d8f9153475cf94e2df03a40c31b", + "version-semver": "10.0.1", + "port-version": 1 + }, { "git-tree": "efcf0cb433b9d901fd6aeb10a85f674352373e6f", "version-semver": "10.0.1", diff --git a/versions/p-/paraview.json b/versions/p-/paraview.json index d6876c736b..ba58478998 100644 --- a/versions/p-/paraview.json +++ b/versions/p-/paraview.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2dbdde07d29c13b69e83fb0a022568b3c20c4b4c", + "version": "5.11.0", + "port-version": 5 + }, { "git-tree": "2aa3d8185a319a76c7961608ecce8b2f03c08cd7", "version": "5.11.0",