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
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
|
diff --git a/meson.build b/meson.build
index 3d8e5508..5572bf61 100644
--- a/meson.build
+++ b/meson.build
@@ -42,7 +42,16 @@ srcInclude = include_directories('src')
warnings = []
-enable_openmp = get_option('openmp')
+enable_openmp = get_option('openmp')
+enable_libraw = get_option('libraw')
+enable_libtiff = get_option('libtiff')
+enable_libjpeg = get_option('libjpeg')
+enable_libpng = get_option('libpng')
+enable_libheif = get_option('libheif')
+enable_ffms2 = get_option('ffms2')
+enable_ffmpeg = get_option('ffmpeg')
+enable_wcslib = get_option('wcslib')
+enable_criterion = get_option('criterion')
# General version
siril_version = meson.project_version()
@@ -257,32 +266,67 @@ if enable_openmp
siril_cpp_flag += ['-Xpreprocessor', '-fopenmp']
siril_c_flag += ['-Xpreprocessor', '-fopenmp']
else
- openmp_dep = dependency('openmp', required : false)
+ openmp_dep = dependency('openmp', required : true)
endif
else
message('OpenMP disabled')
endif
-libraw_dep = dependency('libraw', required : false)
-libtiff_dep = dependency('libtiff-4', required : false)
-libjpeg_dep = dependency('libjpeg', required : false)
-libpng_dep = dependency('libpng', required : false, version: '>= 1.6.0')
-libheif_dep = dependency('libheif', required : false)
-ffms2_dep = dependency('ffms2', required : false)
-ffmpeg = [
- dependency('libavformat', required : false),
- dependency('libavcodec', required : false),
- dependency('libavutil', version : '>= 55.20', required : false),
- dependency('libswscale', required : false),
- dependency('libswresample', required : false)
-]
+libraw_dep = no_dep
+if enable_libraw
+ libraw_dep = dependency('libraw', required : true)
+endif
+
+libtiff_dep = no_dep
+if enable_libtiff
+ libtiff_dep = dependency('libtiff-4', required : true)
+endif
+
+libjpeg_dep = no_dep
+if enable_libjpeg
+ libjpeg_dep = dependency('libjpeg', required : true)
+endif
+
+libpng_dep = no_dep
+if enable_libpng
+ libpng_dep = dependency('libpng', required : true, version: '>= 1.6.0')
+endif
+
+libheif_dep = no_dep
+if enable_libheif
+ libheif_dep = dependency('libheif', required : true)
+endif
+
+ffms2_dep = no_dep
+if enable_ffms2
+ ffms2_dep = dependency('ffms2', required : true)
+endif
+
+ffmpeg = []
+if enable_ffmpeg
+ ffmpeg = [
+ dependency('libavformat', required : true),
+ dependency('libavcodec', required : true),
+ dependency('libavutil', version : '>= 55.20', required : true),
+ dependency('libswscale', required : true),
+ dependency('libswresample', required : true)
+ ]
+endif
+
libcurl_dep = no_dep
if enable_libcurl
- libcurl_dep = dependency('libcurl', required : false)
+ libcurl_dep = dependency('libcurl', required : true)
+endif
+
+criterion_dep = no_dep
+if enable_criterion
+ criterion_dep = dependency('criterion', required : true)
endif
-criterion_dep = dependency('criterion', required : false)
-wcslib_dep = dependency('wcslib', fallback : ['wcslib', 'wcslib_dep'], required : false)
+wcslib_dep = no_dep
+if enable_wcslib
+ wcslib_dep = dependency('wcslib', fallback : ['wcslib', 'wcslib_dep'], required : true)
+endif
################################################################################
# Configuration
diff --git a/meson_options.txt b/meson_options.txt
index cd4b9cc1..5e48ae1f 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -12,9 +12,63 @@ option('openmp',
description: 'build with OpenMP support'
)
+option('libraw',
+ type : 'boolean',
+ value : 'false',
+ description: 'build with LibRaw support'
+)
+
+option('libtiff',
+ type : 'boolean',
+ value : 'false',
+ description: 'build with TIFF support'
+)
+
+option('libjpeg',
+ type : 'boolean',
+ value : 'false',
+ description: 'build with JPEG support'
+)
+
+option('libpng',
+ type : 'boolean',
+ value : 'false',
+ description: 'build with PNG support'
+)
+
+option('libheif',
+ type : 'boolean',
+ value : 'false',
+ description: 'build with HEIF support'
+)
+
+option('ffms2',
+ type : 'boolean',
+ value : 'false',
+ description: 'build with FFMS2 support'
+)
+
+option('ffmpeg',
+ type : 'boolean',
+ value : 'false',
+ description: 'build with FFmpeg support'
+)
+
option('enable-libcurl',
type: 'combo',
value: 'platform-default',
description: 'Use libcurl instead of GIO',
choices: [ 'yes', 'no', 'platform-default' ]
-)
\ No newline at end of file
+)
+
+option('criterion',
+ type : 'boolean',
+ value : 'false',
+ description: 'build with criterion support'
+)
+
+option('wcslib',
+ type : 'boolean',
+ value : 'false',
+ description: 'build with WCSLIB support'
+)
|
