Skip to content

Ensure that we include built-in 3rd party libraries headers#25352

Closed
vadz wants to merge 1 commit intowxWidgets:masterfrom
vadz:builtin-zlib
Closed

Ensure that we include built-in 3rd party libraries headers#25352
vadz wants to merge 1 commit intowxWidgets:masterfrom
vadz:builtin-zlib

Conversation

@vadz
Copy link
Contributor

@vadz vadz commented Apr 29, 2025

Move -I options for built-in 3rd party libraries forward in the compiler command line to ensure that they're getting included even when the system libraries are also available.

Closes #25350.

Use template_append when using 3rd party library template to ensure that
the include directories defined in the <lib> using this template appear
first in the compiler command line, so that the correct headers get
included even when the system libraries are also available.

Note that this required refactoring the old 3rdparty_lib template into
the base 3rdparty_lib_base and new 3rdparty_lib_u, as appending the old
template to wxregex lib overwrote libname defined in the latter
otherwise.

Closes wxWidgets#25350.
@vadz vadz marked this pull request as ready for review May 20, 2025 13:14
vadz added a commit that referenced this pull request May 20, 2025
Use template_append when using 3rd party library template to ensure that
the include directories defined in the <lib> using this template appear
first in the compiler command line, so that the correct headers get
included even when the system libraries are also available.

Note that this required refactoring the old 3rdparty_lib template into
the base 3rdparty_lib_base and new 3rdparty_lib_u, as appending the old
template to wxregex lib overwrote libname defined in the latter
otherwise.

Closes #25350.

See #25352.
@vadz
Copy link
Contributor Author

vadz commented May 20, 2025

Merged in the commit above.

@vadz vadz closed this May 20, 2025
@vadz vadz deleted the builtin-zlib branch May 20, 2025 13:21
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.

BUG: When using built-in png and zlib, its include path has low priority, causing wrong zlib-prefix.

1 participant