From d251d2b29b481dc2d990a7b5581cbb78f1320374 Mon Sep 17 00:00:00 2001 From: Baudouin Raoult Date: Wed, 31 Jan 2024 07:48:29 -0500 Subject: [PATCH] PKG_CONFIG_EXECUTABLE on wndow --- scripts/build-windows.sh | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/scripts/build-windows.sh b/scripts/build-windows.sh index de88a3c..076c940 100755 --- a/scripts/build-windows.sh +++ b/scripts/build-windows.sh @@ -25,11 +25,13 @@ echo git $url $sha1 > versions #find /c/ -name pkg-config.exe #exit 1 -if [[ $WINARCH == "x64" ]]; then - PKG_CONFIG_EXECUTABLE=/c/rtools43/mingw64/bin/pkg-config.exe -else - PKG_CONFIG_EXECUTABLE=/c/rtools43/mingw32/bin/pkg-config.exe -fi +# if [[ $WINARCH == "x64" ]]; then +# PKG_CONFIG_EXECUTABLE=/c/rtools43/mingw64/bin/pkg-config.exe +# else +# PKG_CONFIG_EXECUTABLE=/c/rtools43/mingw32/bin/pkg-config.exe +# fi + +vcpkg install pkgconf for p in expat netcdf-c[core,netcdf-4,hdf5] pango sqlite3[core,tool] libpng do @@ -108,10 +110,11 @@ $TOPDIR/src/ecbuild/bin/ecbuild \ -DENABLE_INSTALL_ECCODES_DEFINITIONS=0 \ -DENABLE_INSTALL_ECCODES_SAMPLES=0 \ -DCMAKE_INSTALL_PREFIX=$TOPDIR/install \ - -DPKG_CONFIG_EXECUTABLE=$PKG_CONFIG_EXECUTABLE \ -DCMAKE_TOOLCHAIN_FILE=/c/vcpkg/scripts/buildsystems/vcpkg.cmake \ -DCMAKE_C_COMPILER=cl.exe $ECCODES_EXTRA_CMAKE_OPTIONS + # -DPKG_CONFIG_EXECUTABLE=$PKG_CONFIG_EXECUTABLE + cd $TOPDIR cmake --build build-ecmwf/eccodes --target install @@ -130,10 +133,12 @@ $TOPDIR/src/ecbuild/bin/ecbuild \ -DENABLE_BUILD_TOOLS=0 \ -Deccodes_DIR=$TOPDIR/install/lib/cmake/eccodes \ -DCMAKE_INSTALL_PREFIX=$TOPDIR/install \ - -DPKG_CONFIG_EXECUTABLE=$PKG_CONFIG_EXECUTABLE \ -DCMAKE_TOOLCHAIN_FILE=/c/vcpkg/scripts/buildsystems/vcpkg.cmake \ -DCMAKE_C_COMPILER=cl.exe + # -DPKG_CONFIG_EXECUTABLE=$PKG_CONFIG_EXECUTABLE + + cd $TOPDIR cmake --build build-ecmwf/magics --target install