Enable OpenMP and GLib GThread in build (#263)

Co-authored-by: conda-forge-webservices[bot] <91080706+conda-forge-webservices[bot]@users.noreply.github.com>
conda-forge · Aug 8, 2023 · d0b8528 · d0b8528
1 parent 2a7a181
commit d0b8528
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 26 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/.ci_support/migrations/libnetcdf491.yaml b/.ci_support/migrations/libnetcdf491.yaml
diff --git a/.ci_support/migrations/libnetcdf492.yaml b/.ci_support/migrations/libnetcdf492.yaml
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/recipe/bld.bat b/recipe/bld.bat
@@ -16,6 +16,8 @@ cmake -G "NMake Makefiles" ^
       -D PCRE_ROOT=%LIBRARY_PREFIX% ^
       -D ZLIB_ROOT=%LIBRARY_PREFIX% ^
       -D CURL_ROOT=%LIBRARY_PREFIX% ^
+      -D GMT_ENABLE_OPENMP=TRUE ^
+      -D GMT_USE_THREADS=TRUE ^
       -D GMT_LIBDIR=lib ^
       -D DCW_ROOT=%DCW_DIR% ^
       -D GSHHG_ROOT=%GSHHG_DIR% ^

diff --git a/recipe/build.sh b/recipe/build.sh
@@ -23,6 +23,8 @@ cmake ${CMAKE_ARGS} -D CMAKE_INSTALL_PREFIX=$PREFIX \
       -D ZLIB_ROOT=$PREFIX \
       -D CURL_ROOT=$PREFIX \
       -D LAPACK_LIBRARIES=$PREFIX/lib/liblapack${SHLIB_EXT} \
+      -D GMT_ENABLE_OPENMP=TRUE \
+      -D GMT_USE_THREADS=TRUE \
       -D GMT_LIBDIR=lib \
       -D DCW_ROOT=$DCW_DIR \
       -D GSHHG_ROOT=$GSHHG_DIR \

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -9,7 +9,7 @@ source:
   sha256: d267c0c7d6fb30c9ea7e029ef27dadb26ffd7b92cb4b4703f9a3ba0e8f393a1b
 
 build:
-  number: 13
+  number: 14
   skip: true  # [win and vc<14]
 
 requirements:
@@ -24,6 +24,7 @@ requirements:
     - fftw
     - gdal
     - geos
+    - glib
     - ghostscript
     - libnetcdf
     - hdf5
@@ -50,12 +51,17 @@ requirements:
 
 test:
   commands:
+    # Test plotting basemap with coastlines
     - gmt defaults -Vd
     - gmt psbasemap -R10/70/-3/8 -JX4i/3i -Ba -B+glightred+t"TEST" -P -Vd > test0.ps
     - gmt pscoast -R0/10/0/10 -JM6i -Ba -Ggray -ENG+p1p,blue -P -Vd > test1.ps
     - gmt begin -Vd
     - gmt coast -R0/10/0/10 -JM6i -Ba -Ggray -ENG+p1p,blue -Vd
     - gmt end
+    # Test OpenMP multi-core with -x2
+    - gmt-config --all  # [not win]
+    - gmt  # [win]
+    - gmt grdmath -Rg -I1 0 90 SDIST = dist_to_NP.nc -x2
 
 about:
   home: https://www.generic-mapping-tools.org