diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index eaf2f193305..99c877b240d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -4,7 +4,7 @@ name: Tests on: - # pull_request: + pull_request: push: branches: - master diff --git a/ci/config-gmt-windows.sh b/ci/config-gmt-windows.sh index fc5ed315d67..6653c5bc5df 100755 --- a/ci/config-gmt-windows.sh +++ b/ci/config-gmt-windows.sh @@ -9,6 +9,7 @@ set (CMAKE_INSTALL_PREFIX "$ENV{INSTALLDIR}") set (GSHHG_ROOT "$ENV{COASTLINEDIR}/gshhg") set (DCW_ROOT "$ENV{COASTLINEDIR}/dcw") +set (GMT_USE_THREADS TRUE) set (GMT_ENABLE_OPENMP TRUE) EOF diff --git a/ci/install-dependencies-windows.sh b/ci/install-dependencies-windows.sh index aa86937af96..e140d1165ac 100755 --- a/ci/install-dependencies-windows.sh +++ b/ci/install-dependencies-windows.sh @@ -19,7 +19,7 @@ PACKAGE="${PACKAGE:-false}" WIN_PLATFORM=x64-windows # install libraries -vcpkg install netcdf-c gdal[core,tools] pcre2 fftw3[core,threads] clapack openblas --triplet ${WIN_PLATFORM} +vcpkg install netcdf-c gdal[core,tools] pcre2 fftw3[core,threads] clapack openblas glib --triplet ${WIN_PLATFORM} # Executable files search for DLL files in the directories listed in the PATH environment variable. echo "${VCPKG_INSTALLATION_ROOT}/installed/${WIN_PLATFORM}/bin" >> $GITHUB_PATH # Tools like gdal_translate, ogr2ogr are located in tools/gdal