|
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 |
10 | 3 | @@ -46,12 +46,12 @@ |
11 | 4 | #set (GMT_INSTALL_TRADITIONAL_FOLDERNAMES OFF) |
12 | 5 |
|
|
28 | 21 | # Set location of NetCDF (can be root directory, path to header file or path |
29 | 22 | # to nc-config) [auto]: |
30 | 23 | -#set (NETCDF_ROOT "netcdf_install_prefix") |
31 | | -+set (NETCDF_ROOT "$ENV{NETCDF_ROOT}") |
| 24 | ++#set (NETCDF_ROOT "$ENV{NETCDF_ROOT}") |
32 | 25 |
|
33 | 26 | # Set location of GDAL (can be root directory, path to header file or path to |
34 | 27 | # gdal-config) [auto]: |
35 | 28 | -#set (GDAL_ROOT "gdal_install_prefix") |
36 | | -+set (GDAL_ROOT "$ENV{GDAL_ROOT}") |
| 29 | ++#set (GDAL_ROOT "$ENV{GDAL_ROOT}") |
37 | 30 |
|
38 | 31 | # Set location of GEOS (can be root directory, path to header file or path to |
39 | 32 | # geos-config) [auto]: |
40 | | -@@ -122,14 +122,14 @@ |
| 33 | +@@ -122,10 +122,10 @@ |
41 | 34 | #set (FFTW3_ROOT "fftw_install_prefix") |
42 | 35 |
|
43 | 36 | # Set location of ZLIB (can be root directory or path to header file) [auto]: |
44 | 37 | -#set (ZLIB_ROOT "zlib_install_prefix") |
45 | | -+set (ZLIB_ROOT "$ENV{ZLIB_ROOT}") |
| 38 | ++#set (ZLIB_ROOT "$ENV{ZLIB_ROOT}") |
46 | 39 |
|
47 | 40 | # Set location of CURL (can be root directory or path to header file) [auto]: |
48 | 41 | -#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 @@ |
50 | 47 |
|
51 | 48 | # 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: |
53 | 50 | -set (GMT_USE_THREADS TRUE) |
54 | | -+# experimental) option which you need to enable: |
55 | 51 | +#set (GMT_USE_THREADS TRUE) |
56 | 52 | # If pkg-config is not installed (e.g. on Windows) you need to specify these: |
57 | 53 | #set (GLIB_INCLUDE_DIR c:/path/to/glib-dev/include/glib-2.0) |
58 | 54 | #set (GLIB_LIBRARIES c:/path/to/glib-dev/lib/glib-2.0.lib) |
59 | | -@@ -148,7 +148,7 @@ |
| 55 | +@@ -152,7 +152,7 @@ |
60 | 56 | #set (LICENSE_RESTRICTED GPL) |
61 | 57 |
|
62 | 58 | # Allow building of OpenMP if compiler supports it |
|
65 | 61 |
|
66 | 62 | # Configure default units (possible values are SI and US) [SI]: |
67 | 63 | #set (UNITS "US") |
68 | | -@@ -163,7 +163,7 @@ |
| 64 | +@@ -167,7 +167,7 @@ |
69 | 65 | #set (CMAKE_POSITION_INDEPENDENT_CODE TRUE) |
70 | 66 |
|
71 | 67 | # Build GMT shared lib with supplemental modules [TRUE]: |
|
74 | 70 |
|
75 | 71 | # Build/Install GMT Developer include files [TRUE]: |
76 | 72 | # 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 |
0 commit comments