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

Pkgconfig CMake compatibility & switch to pkgconf #693

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
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
6 changes: 3 additions & 3 deletions bin/nxdk-pkg-config
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ export PKG_CONFIG_PATH=""
export PKG_CONFIG_SYSROOT_DIR=""
export PKG_CONFIG_LIBDIR=${NXDK_DIR}/lib/pkgconfig:${NXDK_DIR}/share/pkgconfig

[ "$1" = '--version' ] && exec pkg-config --version
exec pkg-config \
[ "$1" = '--version' ] && exec pkgconf --version
exec pkgconf \
--define-variable=NXDK_DIR=${NXDK_DIR} \
--define-prefix \
--static \
"$@"
"$@" | sed 's/\.lib\.lib/\.lib/g'
Copy link
Member

@JayFoxRox JayFoxRox Jan 10, 2025

Choose a reason for hiding this comment

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

I'm not sure I follow the PR description.

I thought the .lib.lib only happens when using --msvc-syntax, but now --msvc-syntax is absent?
(Also, why does it produce .lib.lib? This feels like a bug - was it reported?)