summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelipe CorrĂȘa da Silva Sanches <juca@members.fsf.org>2018-03-17 11:42:57 +0000
committerFelipe CorrĂȘa da Silva Sanches <juca@members.fsf.org>2018-03-17 20:54:37 +0000
commit16d386e16052b09d4f3a8800cf9b7bfd8626cfe9 (patch)
tree472d9697c8cdfc2bcc37cb92cacf367f2e4357d0
parent[meson-build] inkscape-version placeholder (diff)
downloadinkscape-16d386e16052b09d4f3a8800cf9b7bfd8626cfe9.tar.gz
inkscape-16d386e16052b09d4f3a8800cf9b7bfd8626cfe9.zip
First successful build of Inkscape using the new/experimental meson-build system!
Lots of things supported by cmake are surely still missing, but at least I got a running binary, so this is consider the MVP ;-) Suggestions for possible improvements (as well as patches) are welcome! Please, also help me identify any shortcomings of the current meson build.
-rw-r--r--meson.build8
1 files changed, 6 insertions, 2 deletions
diff --git a/meson.build b/meson.build
index 434a678bf..2f797869c 100644
--- a/meson.build
+++ b/meson.build
@@ -29,6 +29,7 @@ png_req = '>= 1.2.54' #TODO: 1.6.2 ?
soup_req = '>= 2.41.90'
zlib_req = '>= 1.1.4'
xslt_req = '>= 1.1.25'
+popt_req = '>= 1.14'
# Dependencies
sigcpp_dep = dependency('sigc++-2.0', version: sigcpp_req, required : true)
@@ -56,6 +57,7 @@ soup_dep = dependency('libsoup-2.4', version: soup_req, required : tru
zlib_dep = dependency('zlib', version: zlib_req, required : true)
x11_dep = dependency('x11', required : true)
xslt_dep = dependency('libxslt', version: xslt_req, required : true)
+popt_dep = dependency('popt', version: popt_req, required : true)
add_project_arguments('-DHAVE_CONFIG_H', language: 'cpp')
@@ -105,11 +107,13 @@ inkscape_deps = [
glibmm_dep,
gtkmm_dep,
xml2_dep,
- x11_dep
+ x11_dep,
+ popt_dep
]
executable('inkscape',
- sources: 'src/inkscape.cpp',
+ sources: ['src/inkscape.cpp',
+ 'src/main.cpp'],
dependencies : [common_deps,
inkscape_deps],
include_directories: [srcinc, confinc]