Commit 79ba4b50 authored by Daniel Espinosa Ortiz's avatar Daniel Espinosa Ortiz

Merge branch 'mesondoc' into 'master'

MESON: enable-gtk-doc was added as an option

See merge request !83
parents 889f918b 1a159a14
Pipeline #56249 passed with stages
in 38 minutes and 12 seconds
......@@ -127,7 +127,7 @@ meson_build:
script:
- export PGPASSWORD=$POSTGRES_PASSWORD
- psql -h "postgres" -U "$POSTGRES_USER" -d "$POSTGRES_DB" -c "SELECT 'OK' AS status;"
- meson _build --prefix=/usr -Denable-ci-environment=true -Denable-debug=true
- meson _build --prefix=/usr -Denable-ci-environment=true -Denable-debug=true -Denable-gtk-doc=true
- cd _build
- ninja
- broadwayd &
......@@ -147,7 +147,7 @@ meson_build:
pages:
stage: build
script:
- meson _build
- meson -Denable-gtk-doc=true _build
- cd _build
- ninja
- ninja install
......@@ -168,4 +168,4 @@ pages:
- mv doc/C/libgdaui/html public/C/libgdaui-6.0
artifacts:
paths:
- public
\ No newline at end of file
- public
......@@ -349,7 +349,9 @@ int main() {
subdir('control-center')
endif
subdir('doc')
if get_option('enable-gtk-doc')
subdir('doc')
endif
if libxslt_dep.found()
subdir('libgda-xslt')
......
......@@ -17,4 +17,5 @@ option('enable-tools', type : 'boolean', value : false, description : 'Enable bu
option('enable-ci-environment', type : 'boolean', value : false, description : 'Enable Continous Integration Environment test')
option('glade-catalog-dir', type : 'string', value : '', description : 'Use the given directory to install glade catalog files. If glade is not available this option is ignored. If it is not given the valaue from pkg-config will be used')
option('glade-pixmap-dir', type : 'string', value : '', description : 'Use the given directory to install glade pixmap files. If glade is not available this option is ignored. If it is not given the valaue from pkg-config will be used')
option('enable-gtk-doc', type : 'boolean', value : false, description : 'Enable documentation generation [default = false]')
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment