From 1f16bc38474b4de3ce161d42261ad2ba6390a867 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 21 Aug 2023 20:54:51 +0200 Subject: [PATCH] [cgns] fix core build on windows (#33269) --- ports/cgns/portfile.cmake | 11 +++++------ ports/cgns/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cgns.json | 5 +++++ 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ports/cgns/portfile.cmake b/ports/cgns/portfile.cmake index 6d1542a02b..77db76dde6 100644 --- a/ports/cgns/portfile.cmake +++ b/ports/cgns/portfile.cmake @@ -57,13 +57,12 @@ vcpkg_copy_tools( AUTO_CLEAN ) +set(TOOLS "cgnsupdate") +if("hdf5" IN_LIST FEATURES) + list(APPEND TOOLS "adf2hdf" "hdf2adf") +endif() if(VCPKG_TARGET_IS_WINDOWS) - set(TOOLS "adf2hdf.bat" "hdf2adf.bat" "cgnsupdate.bat") -elseif(VCPKG_TARGET_IS_LINUX) - set(TOOLS "cgnsupdate") - if("hdf5" IN_LIST FEATURES) - list(APPEND TOOLS "adf2hdf" "hdf2adf") - endif() + list(TRANSFORM TOOLS APPEND ".bat") endif() foreach(TOOL ${TOOLS}) diff --git a/ports/cgns/vcpkg.json b/ports/cgns/vcpkg.json index 48fd819bd1..faec2e964a 100644 --- a/ports/cgns/vcpkg.json +++ b/ports/cgns/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cgns", "version-semver": "4.3.0", - "port-version": 4, + "port-version": 5, "description": "The CFD General Notation System (CGNS) provides a standard for recording and recovering computer data associated with the numerical solution of fluid dynamics equations.", "homepage": "http://cgns.org/", "license": "Zlib", diff --git a/versions/baseline.json b/versions/baseline.json index e5a1b9b91e..b94ae6ab66 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1498,7 +1498,7 @@ }, "cgns": { "baseline": "4.3.0", - "port-version": 4 + "port-version": 5 }, "chaiscript": { "baseline": "6.1.0", diff --git a/versions/c-/cgns.json b/versions/c-/cgns.json index d89e2062e7..697766c4ab 100644 --- a/versions/c-/cgns.json +++ b/versions/c-/cgns.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9d4b2d4f75c71bf4a4b66a6cb8bf79e119be4dd7", + "version-semver": "4.3.0", + "port-version": 5 + }, { "git-tree": "98f56fa77d5ab2c24d5d8a9932129626feb65df5", "version-semver": "4.3.0",