Skip to content

update pc generation to work better #78

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

Merged
SolidWallOfCode merged 1 commit into from
Feb 15, 2023
Merged

update pc generation to work better #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion code/libswoc.pc.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ Name: LibSWOC++
Description: A collection of solid C++ utilities and classes.
Version: pkg_version
Requires:
Libs: -L${libdir} -lswoc.pkg_version
Libs: -L${libdir} -lswoc-pkg_version
Cflags: -I${includedir}
9 changes: 7 additions & 2 deletions code/libswoc.shared.part
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,13 @@ def source(env):
env.InstallLib(out)

# Export the package config.
pc_file = env.Substfile("libswoc.pc", "libswoc.pc.in", SUBST_DICT={
sdk_pc_file = env.Substfile("libswoc.pc", "libswoc.pc.in", SUBST_DICT={
"pkg_prefix": env.Dir("$SDK_ROOT").abspath, "pkg_version": "$PART_VERSION"
})

pc_file = env.Substfile("_install_/libswoc.pc", "libswoc.pc.in", SUBST_DICT={
"pkg_prefix": env.Dir("$INSTALL_ROOT").abspath, "pkg_version": "$PART_VERSION"
})

env.InstallPkgConfig(pc_file)
env.SdkPkgConfig(sdk_pc_file)
env.InstallPkgConfig(pc_file,create_sdk=False)
11 changes: 9 additions & 2 deletions code/libswoc.static.part
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,18 @@ def source(env):
env.InstallLib(out)

# Export the package config.
pc_file = env.Substfile("libswoc.static.pc", "libswoc.static.pc.in"
sdk_pc_file = env.Substfile("libswoc.static.pc", "libswoc.static.pc.in"
, SUBST_DICT = {
"pkg_prefix": env.Dir("$SDK_ROOT").abspath
, "pkg_version": "$PART_VERSION"
})

pc_file = env.Substfile("_install_/libswoc.static.pc", "libswoc.static.pc.in"
, SUBST_DICT = {
"pkg_prefix": env.Dir("$INSTALL_ROOT").abspath
, "pkg_version": "$PART_VERSION"
})


env.InstallPkgConfig(pc_file)
env.SdkPkgConfig(sdk_pc_file)
env.InstallPkgConfig(pc_file,create_sdk=False)