Merge b15401b into 09ac529

GenericMappingTools · Jul 30, 2021 · 9f136be · 9f136be
2 parents 09ac529 + b15401b
commit 9f136be
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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
@@ -19,7 +19,7 @@ PACKAGE="${PACKAGE:-false}"
 WIN_PLATFORM=x64-windows
 
 # install libraries
-vcpkg install netcdf-c gdal pcre2 fftw3[core,threads] clapack openblas --triplet ${WIN_PLATFORM}
+vcpkg install netcdf-c gdal 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