Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: Enable GMT_USE_THREADS on Windows CI #5560

Draft
wants to merge 10 commits into
base: master
Choose a base branch
from
Draft

WIP: Enable GMT_USE_THREADS on Windows CI #5560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8dfc564
Enable GMT_USE_THREADS on Windows CI
seisman Jul 28, 2021
b661c1a
Enable cache in PR
seisman Jul 28, 2021
f93eada
Enable tests in PR
seisman Jul 28, 2021
4d01e73
Disable cache in PR
seisman Jul 29, 2021
5eae2f0
Merge branch 'master' into windows-glib
seisman Jul 29, 2021
76f19bd
Merge branch 'master' into windows-glib
seisman Jul 30, 2021
3e1526e
Cache vpckg
seisman Jul 30, 2021
82f3097
Disable cache in PR
seisman Jul 30, 2021
b15401b
Merge branch 'master' into windows-glib
seisman Jul 30, 2021
3453f9c
Merge branch 'master' into windows-glib
seisman Mar 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
name: Tests

on:
# pull_request:
pull_request:
push:
branches:
- master
Expand Down
1 change: 1 addition & 0 deletions ci/config-gmt-windows.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion ci/install-dependencies-windows.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down