Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

icu: icu-io add include directories #1620

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

icu: icu-io add include directories #1620

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
17f4dcd
icu: icu-io add include directories
hashitaku Aug 19, 2024
6dde964
icu: Modify release.json
hashitaku Aug 21, 2024
2288e31
fix: remove include directories variable
hashitaku Sep 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions subprojects/packagefiles/icu/source/io/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@ io_lib = library(
install: true,
)

ioinc = include_directories('.')

icuio_dep = declare_dependency(
include_directories: ioinc,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
ioinc = include_directories('.')
icuio_dep = declare_dependency(
include_directories: ioinc,
icuio_dep = declare_dependency(
include_directories: include_directories('.'),

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's mostly a preference thing. I'd keep it as is.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unless it's used elsewhere, I don't see the point, especially with meson lack of scoping.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wrapdb/subprojects/packagefiles/icu/source/i18n/meson.build

Lines 38 to 44 in a5cdf0b

i18ninc = include_directories('.')
icui18n_dep = declare_dependency(
include_directories: i18ninc,
link_with: i18n_lib,
dependencies: icuuc_dep,
)

I used i18n code as a reference.
Which is better?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the i18n case, it makes sense: i18ninc is used more than one time. (Although the inconsistent naming, not i18n_inc, irks me :P)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Anyway, don't mind me, if @neheb is happy.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

icuio_depinc makes sense IMO

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry I'm late.
I removed the variables and put them on one line.

link_with: io_lib,
dependencies: icui18n_dep,
)
Expand Down
Loading