Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
Gxml
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Canek Peláez Valdés
Gxml
Commits
0ec779d7
Unverified
Commit
0ec779d7
authored
2 years ago
by
Tristan Ross
Committed by
Tristan Ross
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
fix: issues with gir and vapi on macOS
parent
74db0f15
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
docs/meson.build
+2
-0
2 additions, 0 deletions
docs/meson.build
gxml/meson.build
+1
-1
1 addition, 1 deletion
gxml/meson.build
meson.build
+7
-2
7 additions, 2 deletions
meson.build
with
10 additions
and
3 deletions
docs/meson.build
+
2
−
0
View file @
0ec779d7
...
...
@@ -6,6 +6,7 @@ valacapi = run_command ('valac', '--api-version')
driver
=
'--driver='
+
valacapi
.
stdout
().
strip
()
pkgname
=
'--package-name='
+
'GXml-'
+
API_VERSION
pkgversion
=
'--package-version='
+
PROJECT_VERSION
vapidirgee
=
'--vapidir='
+
gee_vapidir
vapidirgxml
=
'--vapidir='
+
join_paths
(
meson
.
current_source_dir
(),
'gxml'
)
vapidirvapi
=
'--vapidir='
+
join_paths
(
meson
.
current_source_dir
(),
'vapi'
)
docsdir
=
join_paths
(
get_option
(
'datadir'
),
'devhelp'
,
'books'
)
...
...
@@ -30,6 +31,7 @@ custom_target ('libgxml-valadocs',
'--pkg=gio-2.0'
,
'--pkg=libxml-2.0'
,
'--pkg=gee-0.8'
,
vapidirgee
,
vapidirgxml
,
configvapi
,
'--directory=@OUTDIR@'
,
...
...
This diff is collapsed.
Click to expand it.
gxml/meson.build
+
1
−
1
View file @
0ec779d7
...
...
@@ -155,7 +155,7 @@ custom_target('libgxml-typelib',
command
:
[
g_ir_compiler
,
'--shared-library'
,
'lib'
+
PROJECT_NAME
+
'-@0@.so'
.
format
(
API_VERSION
),
'--output'
,
'@OUTPUT@'
,
'--output'
,
'@OUTPUT@'
,
'--includedir'
,
gee_girdir
,
join_paths
(
meson
.
current_build_dir
(),
GIR_NAME
)
],
output
:
TYPELIB_NAME
,
...
...
This diff is collapsed.
Click to expand it.
meson.build
+
7
−
2
View file @
0ec779d7
...
...
@@ -7,11 +7,16 @@ VERSIONED_PROJECT_NAME = PROJECT_NAME+'-'+API_VERSION
CAMEL_CASE_NAME
=
'GXml'
VERSIONED_CAMEL_CASE_NAME
=
CAMEL_CASE_NAME
+
'-'
+
API_VERSION
gee
=
dependency
(
'gee-0.8'
)
gee_girdir
=
gee
.
get_variable
(
'datadir'
)
/
'gir-1.0'
gee_vapidir
=
gee
.
get_variable
(
'datadir'
)
/
'vala'
/
'vapi'
add_project_arguments
([
'--vapidir'
,
gee_vapidir
],
language
:
'vala'
)
libgxml_deps
=
[
dependency
(
'libxml-2.0'
),
dependency
(
'gio-2.0'
),
dependency
(
'gee-0.8'
),
meson
.
get_compiler
(
'c'
).
find_library
(
'intl'
,
required
:
false
)
meson
.
get_compiler
(
'c'
).
find_library
(
'intl'
,
required
:
false
),
gee
]
VALADEPS
=
'gee-0.8
\n
gio-2.0
\n
libxml-2.0'
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment