[libgda: 1/2] MESON: enable-gtk-doc was added as an option
- From: Daniel Espinosa Ortiz <despinosa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgda: 1/2] MESON: enable-gtk-doc was added as an option
- Date: Tue, 5 Feb 2019 00:12:19 +0000 (UTC)
commit 1a159a1424ce5c1018bb1799c942248af81a04f6
Author: Pavlo Solntsev <p sun fun gmail com>
Date: Fri Jan 25 13:15:19 2019 -0600
MESON: enable-gtk-doc was added as an option
.gitlab-ci.yml | 6 +++---
meson.build | 4 +++-
meson_options.txt | 1 +
3 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index de9e78885..482a1ca7b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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
diff --git a/meson.build b/meson.build
index 78829fc3a..b7eabcb26 100644
--- a/meson.build
+++ b/meson.build
@@ -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')
diff --git a/meson_options.txt b/meson_options.txt
index b0415ed0c..50f1efa37 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -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]')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]