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.

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

icu: icu-io add include directories #1620

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

Conversation

hashitaku
Copy link

Closes #1619

Comment on lines 18 to 21
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.

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.

@benoit-pierre
Copy link
Contributor

You need to bump the revision in releases.json:

diff --git i/releases.json w/releases.json
index 2fb522a4..480c49a1 100644
--- i/releases.json
+++ w/releases.json
@@ -1229,6 +1229,7 @@
       "gencmn"
     ],
     "versions": [
+      "73.2-3",
       "73.2-2",
       "73.2-1",
       "73.1-1",

Removed 'ioinc' as it is not used more than once
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

icu: Include file not found
3 participants