diff options
| author | Felipe Corrêa da Silva Sanches <juca@members.fsf.org> | 2018-03-17 05:38:28 +0000 |
|---|---|---|
| committer | Felipe Corrêa da Silva Sanches <juca@members.fsf.org> | 2018-03-17 20:54:37 +0000 |
| commit | 264270671a0c4ee8955bd3a2f8662e5e37363f3c (patch) | |
| tree | e518c72aa1fc4accb2c863b1e0e5fe056153fa49 /src | |
| parent | [meson-build] [BROKEN] libextension (diff) | |
| download | inkscape-264270671a0c4ee8955bd3a2f8662e5e37363f3c.tar.gz inkscape-264270671a0c4ee8955bd3a2f8662e5e37363f3c.zip | |
[meson-build] fix broken build of libextension static lib
This one was subtle!
Diffstat (limited to 'src')
| -rw-r--r-- | src/extension/meson.build | 11 | ||||
| -rw-r--r-- | src/meson.build | 7 |
2 files changed, 14 insertions, 4 deletions
diff --git a/src/extension/meson.build b/src/extension/meson.build index a34025a6c..b86102f44 100644 --- a/src/extension/meson.build +++ b/src/extension/meson.build @@ -246,6 +246,15 @@ libextension = static_library('extension', sources: [extension_sources, extension_headers], dependencies: libextension_deps, - include_directories: [srcinc, confinc]) + include_directories: [confinc, srcinc], + implicit_include_directories: false) +# NOTE: +# The reason for disabling implicit includedirs above is that +# the Inkscape source tree has got two different headers with +# the same filename: +# src/print.h and src/extension/print.h +# Due to an implicit -I../src/extension the wrong header ended up +# being used resulting in a broken build. +# -- Felipe "Juca" Sanches libextension_dep = declare_dependency(link_with : libextension) diff --git a/src/meson.build b/src/meson.build index 2b72ed684..c2a89cead 100644 --- a/src/meson.build +++ b/src/meson.build @@ -12,9 +12,10 @@ subdir('widgets') subdir('livarot') # required by libnrtype subdir('svg') # required by libnrtype subdir('libnrtype') -subdir('extension') -subdir('io') subdir('util') +subdir('io') +subdir('xml') +subdir('extension') subdir('libavoid') subdir('libvpsc') # required by libcola subdir('libcola') @@ -22,7 +23,7 @@ subdir('2geom') subdir('inkgc') subdir('ui') subdir('display') -subdir('xml') + srcdir_sources = files([ 'attribute-rel-css.cpp', |