Skip to content

Commit 3795fa2

Browse files
Updated patch files for GMT 6.6
1 parent a6536fc commit 3795fa2

2 files changed

Lines changed: 25 additions & 68 deletions

File tree

Lines changed: 14 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
1-
--- ./src/cmake/ConfigUserAdvancedTemplate.cmake 2024-01-07 01:32:40
2-
+++ ./ConfigUserAdvancedTemplate.cmake 2024-03-23 11:15:43
3-
@@ -1,5 +1,5 @@
4-
#
5-
-# Copyright (c) 1991-2024 by the GMT Team (https://www.generic-mapping-tools.org/team.html)
6-
+# Copyright (c) 1991-2022 by the GMT Team (https://www.generic-mapping-tools.org/team.html)
7-
# See LICENSE.TXT file for copying and redistribution conditions.
8-
#
9-
# This program is free software; you can redistribute it and/or modify it
1+
--- src/cmake/ConfigUserAdvancedTemplate.cmake 2026-01-29 12:44:03
2+
+++ src/cmake/ConfigUser.cmake 2026-01-29 12:45:30
103
@@ -46,12 +46,12 @@
114
#set (GMT_INSTALL_TRADITIONAL_FOLDERNAMES OFF)
125

@@ -28,35 +21,38 @@
2821
# Set location of NetCDF (can be root directory, path to header file or path
2922
# to nc-config) [auto]:
3023
-#set (NETCDF_ROOT "netcdf_install_prefix")
31-
+set (NETCDF_ROOT "$ENV{NETCDF_ROOT}")
24+
+#set (NETCDF_ROOT "$ENV{NETCDF_ROOT}")
3225

3326
# Set location of GDAL (can be root directory, path to header file or path to
3427
# gdal-config) [auto]:
3528
-#set (GDAL_ROOT "gdal_install_prefix")
36-
+set (GDAL_ROOT "$ENV{GDAL_ROOT}")
29+
+#set (GDAL_ROOT "$ENV{GDAL_ROOT}")
3730

3831
# Set location of GEOS (can be root directory, path to header file or path to
3932
# geos-config) [auto]:
40-
@@ -122,14 +122,14 @@
33+
@@ -122,10 +122,10 @@
4134
#set (FFTW3_ROOT "fftw_install_prefix")
4235

4336
# Set location of ZLIB (can be root directory or path to header file) [auto]:
4437
-#set (ZLIB_ROOT "zlib_install_prefix")
45-
+set (ZLIB_ROOT "$ENV{ZLIB_ROOT}")
38+
+#set (ZLIB_ROOT "$ENV{ZLIB_ROOT}")
4639

4740
# Set location of CURL (can be root directory or path to header file) [auto]:
4841
-#set (CURL_ROOT "curl_install_prefix")
49-
+set (CURL_ROOT "$ENV{CURL_ROOT}")
42+
+#set (CURL_ROOT "$ENV{CURL_ROOT}")
43+
44+
# Set location of OpenMP (can be root directory or path to header file) [auto]:
45+
# CMake sometimes may fail to find the OpenMP library (libomp) on macOS.
46+
@@ -133,7 +133,7 @@
5047

5148
# Set location of GLIB component gthread [auto]. This is an optional (and
52-
-# experimental) option which you need to enable or disable:
49+
# experimental) option which you need to enable or disable:
5350
-set (GMT_USE_THREADS TRUE)
54-
+# experimental) option which you need to enable:
5551
+#set (GMT_USE_THREADS TRUE)
5652
# If pkg-config is not installed (e.g. on Windows) you need to specify these:
5753
#set (GLIB_INCLUDE_DIR c:/path/to/glib-dev/include/glib-2.0)
5854
#set (GLIB_LIBRARIES c:/path/to/glib-dev/lib/glib-2.0.lib)
59-
@@ -148,7 +148,7 @@
55+
@@ -152,7 +152,7 @@
6056
#set (LICENSE_RESTRICTED GPL)
6157

6258
# Allow building of OpenMP if compiler supports it
@@ -65,7 +61,7 @@
6561

6662
# Configure default units (possible values are SI and US) [SI]:
6763
#set (UNITS "US")
68-
@@ -163,7 +163,7 @@
64+
@@ -167,7 +167,7 @@
6965
#set (CMAKE_POSITION_INDEPENDENT_CODE TRUE)
7066

7167
# Build GMT shared lib with supplemental modules [TRUE]:
@@ -74,42 +70,3 @@
7470

7571
# Build/Install GMT Developer include files [TRUE]:
7672
# This installs the extra include files and configured files needed by 3rd-party
77-
@@ -204,8 +204,9 @@
78-
#set (DO_SUPPLEMENT_TESTS ON)
79-
80-
# Uncomment the following line if you need to run the full tests suite using
81-
-# the gmtserver "static" distribution instead of the default server.
82-
-# set (GMT_DATA_SERVER "static")
83-
+# the gmtserver "test" distribution instead of the default server.
84-
+# You may wish to rename existing cache and server dirs so you can restore afterwards
85-
+# set (GMT_DATA_SERVER "test")
86-
87-
# List extra sub-dirs of 'src' with a CMakeLists.txt to build custom modules
88-
# that link against the full gmt libs. (For building codes that only need the GMT API,
89-
@@ -218,8 +219,8 @@
90-
#set (GMT_RELEASE_PREFIX "release-src-prefix")
91-
92-
# If set to false, image conversion from PS images to PNG and PDF does
93-
-# not depend on the gmt binary target. It assumes that you already have the
94-
-# gmt executable in your PATH [TRUE].
95-
+# not depend on the gmt binary target. Note: "make gmt" is then required
96-
+# before docs_depends [TRUE].
97-
#set (GMT_DOCS_DEPEND_ON_GMT FALSE)
98-
99-
#
100-
@@ -236,14 +237,9 @@
101-
# add_definitions(-DDEBUG_MODERN) # To set PPID == 0 during Xcode test
102-
# message("Add Xcode definition for GMT")
103-
#endif()
104-
-
105-
-# Uncomment if you want to temporarily replace Miller projection with the "Christmas" projection.
106-
-# add_definitions(-DCHRISTMAS)
107-
-# Then, rebuild GMT and try the script share/tools/christmas-cube.sh
108-
-
109-
# Uncomment these two statements if you are a developer debugging GMT:
110-
#add_definitions(-DDEBUG)
111-
-#add_definitions(-DMEMDEBUG) # Turn on memory tracking; see gmt_memory .c on MEMDEBUG for information
112-
+#add_definitions(-DMEMDEBUG) # Turn on memory tracking see gmt_support.c for extra info
113-
#add_definitions(-DUSE_COMMON_LONG_OPTIONS) # Turn on testing of upcoming long-option syntax for common GMT options
114-
#add_definitions(-DUSE_MODULE_LONG_OPTIONS) # Turn on testing of upcoming long-option syntax for module options
115-
#add_definitions(-DEXPORT_GMTLIB) # Turn on to access normally un-exported or static gmtlib functions from external tools

externalpackages/gmt/configs/6.6/static/cmake/ConfigUserAdvancedTemplate.cmake.patch

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- ./src/cmake/ConfigUserAdvancedTemplate.cmake 2024-01-07 01:32:40
2-
+++ ./ConfigUserAdvancedTemplate.cmake 2024-03-23 11:00:04
1+
--- src/cmake/ConfigUserAdvancedTemplate.cmake 2025-07-23 03:39:53
2+
+++ src/cmake/ConfigUser.cmake 2026-01-29 12:55:46
33
@@ -46,12 +46,12 @@
44
#set (GMT_INSTALL_TRADITIONAL_FOLDERNAMES OFF)
55

@@ -21,12 +21,12 @@
2121
# Set location of NetCDF (can be root directory, path to header file or path
2222
# to nc-config) [auto]:
2323
-#set (NETCDF_ROOT "netcdf_install_prefix")
24-
+set (NETCDF_ROOT "$ENV{NETCDF_ROOT}")
24+
+#set (NETCDF_ROOT "$ENV{NETCDF_ROOT}")
2525

2626
# Set location of GDAL (can be root directory, path to header file or path to
2727
# gdal-config) [auto]:
2828
-#set (GDAL_ROOT "gdal_install_prefix")
29-
+set (GDAL_ROOT "$ENV{GDAL_ROOT}")
29+
+#set (GDAL_ROOT "$ENV{GDAL_ROOT}")
3030

3131
# Set location of GEOS (can be root directory, path to header file or path to
3232
# geos-config) [auto]:
@@ -35,15 +35,15 @@
3535

3636
# Set location of ZLIB (can be root directory or path to header file) [auto]:
3737
-#set (ZLIB_ROOT "zlib_install_prefix")
38-
+set (ZLIB_ROOT "$ENV{ZLIB_ROOT}")
38+
+#set (ZLIB_ROOT "$ENV{ZLIB_ROOT}")
3939

4040
# Set location of CURL (can be root directory or path to header file) [auto]:
4141
-#set (CURL_ROOT "curl_install_prefix")
42-
+set (CURL_ROOT "$ENV{CURL_ROOT}")
42+
+#set (CURL_ROOT "$ENV{CURL_ROOT}")
4343

44-
# Set location of GLIB component gthread [auto]. This is an optional (and
45-
# experimental) option which you need to enable or disable:
46-
@@ -163,7 +163,7 @@
44+
# Set location of OpenMP (can be root directory or path to header file) [auto]:
45+
# CMake sometimes may fail to find the OpenMP library (libomp) on macOS.
46+
@@ -167,7 +167,7 @@
4747
#set (CMAKE_POSITION_INDEPENDENT_CODE TRUE)
4848

4949
# Build GMT shared lib with supplemental modules [TRUE]:
@@ -52,12 +52,12 @@
5252

5353
# Build/Install GMT Developer include files [TRUE]:
5454
# This installs the extra include files and configured files needed by 3rd-party
55-
@@ -281,7 +281,7 @@
55+
@@ -283,7 +283,7 @@
5656
#set (CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS c:/Windows/System32/msvcr100.dll)
5757

5858
# If your NetCDF library is static (not recommended, applies to Windows only)
5959
-#set (NETCDF_STATIC TRUE)
6060
+set (NETCDF_STATIC TRUE)
6161

6262
# If want to rename the DLLs to something else than the default (e.g. to
63-
# append the bitness - Windows only)
63+
# append the bitness - Windows only)

0 commit comments

Comments
 (0)