1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
Description: Disable non-free triangle source use.
Author: Bas Couwenberg <sebastic@debian.org>
Forwarded: not-needed
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -336,21 +336,21 @@ include(ConfigureChecks)
##
## License restrictions
##
-if (NOT LICENSE_RESTRICTED) # off
- # enable Shewchuk's triangle routine
- set (GMT_TRIANGULATE "Shewchuk" PARENT_SCOPE)
- set (GMT_TRIANGLE_SRCS triangle.c triangle.h)
- list (APPEND GMT_EXTRA_LICENSE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.TRIANGLE)
- set (GMT_EXTRA_LICENSE_FILES ${GMT_EXTRA_LICENSE_FILES} PARENT_SCOPE)
-
- # extra ugly definitions for triangle
- set_source_files_properties (triangle.c
- PROPERTIES
- COMPILE_DEFINITIONS "NO_TIMER;TRILIBRARY;REDUCED;CDT_ONLY;ANSI_DECLARATORS")
-else (NOT LICENSE_RESTRICTED) # on
+#if (NOT LICENSE_RESTRICTED) # off
+# # enable Shewchuk's triangle routine
+# set (GMT_TRIANGULATE "Shewchuk" PARENT_SCOPE)
+# set (GMT_TRIANGLE_SRCS triangle.c triangle.h)
+# list (APPEND GMT_EXTRA_LICENSE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.TRIANGLE)
+# set (GMT_EXTRA_LICENSE_FILES ${GMT_EXTRA_LICENSE_FILES} PARENT_SCOPE)
+#
+# # extra ugly definitions for triangle
+# set_source_files_properties (triangle.c
+# PROPERTIES
+# COMPILE_DEFINITIONS "NO_TIMER;TRILIBRARY;REDUCED;CDT_ONLY;ANSI_DECLARATORS")
+#else (NOT LICENSE_RESTRICTED) # on
# disable Shewchuk's triangle routine
set (GMT_TRIANGULATE "Watson" PARENT_SCOPE)
-endif (NOT LICENSE_RESTRICTED)
+#endif (NOT LICENSE_RESTRICTED)
##
@@ -413,7 +413,7 @@ set (GMT_LIB_SRCS block_subs.h gmt_commo
gmt_plot.h gmt_project.h gmt_prototypes.h gmt_psl.h gmt_shore.h gmt_gsformats.h
gmt_symbol.h gmt_synopsis.h gmt_texture.h gmt_time.h gmt_cpt_masters.h
gmt_types.h gmt_unique.h gmt_version.h gshhg_version.h postscriptlight.h
- s_rint.h triangle.h gmt.h gmt_resources.h gmt_private.h subplot.c
+ s_rint.h gmt.h gmt_resources.h gmt_private.h subplot.c
gmt_error_codes.h gmt_api.c gmt_bcr.c gmt_calclock.c gmt_cdf.c
gmt_customio.c gmt_dcw.c gmt_error.c gmt_fft.c gmt_grdio.c gmt_io.c
gmt_memory.c gmt_nc.c gmt_notposix.c gmt_shore.c gmt_sph.c
|
