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

Jump to bottom

CI: Enable OpenMP on Linux and macOS #6742

Merged
merged 12 commits into from Jul 23, 2023
Merged

CI: Enable OpenMP on Linux and macOS #6742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
088e9ef
Enable OpenMP on Linux and macOS
seisman May 25, 2022
9640938
Merge branch 'master' into enable-openmp
seisman Jun 1, 2022
51a8941
Merge branch 'master' into enable-openmp
seisman Jun 7, 2022
a7aa3f2
Merge branch 'master' into enable-openmp
seisman Jun 8, 2022
3737492
Merge branch 'master' into enable-openmp
seisman Jun 10, 2022
d027ccc
Merge branch 'master' into enable-openmp
seisman Jul 9, 2022
0a1ee48
Install libomp
seisman Jul 9, 2022
3afb207
Use target_link_libraries to link libraries
seisman Jul 9, 2022
f4bc0e1
Fix
seisman Jul 9, 2022
c20e64e
Fix
seisman Jul 9, 2022
87dad38
Fix
seisman Jul 9, 2022
4182ea7
Merge branch 'master' into enable-openmp
seisman Jul 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci/config-gmt-unix.sh
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@ set (GSHHG_ROOT "$ENV{COASTLINEDIR}/gshhg")
set (DCW_ROOT "$ENV{COASTLINEDIR}/dcw")

set (GMT_USE_THREADS TRUE)
# set (GMT_ENABLE_OPENMP TRUE)
set (GMT_ENABLE_OPENMP TRUE)

# recommended even for release build
set (CMAKE_C_FLAGS "-Wall -Wdeclaration-after-statement ${CMAKE_C_FLAGS}")
Expand Down
2 changes: 1 addition & 1 deletion ci/install-dependencies-macos.sh
View file
Open in desktop
Expand Up @@ -17,7 +17,7 @@ PACKAGE="${PACKAGE:-false}"

# packages for compiling GMT
# cmake is pre-installed on GitHub Actions
packages="ninja curl pcre2 netcdf gdal geos fftw ghostscript"
packages="ninja curl pcre2 netcdf gdal geos fftw ghostscript libomp"

# packages for build documentation
if [ "$BUILD_DOCS" = "true" ]; then
Expand Down