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

libalsa: restore .names["pkg_config"] + add ALSA_CONFIG_DIR to runenv_info #8809

Merged
merged 2 commits into from
Jan 12, 2022
Merged

libalsa: restore .names["pkg_config"] + add ALSA_CONFIG_DIR to runenv_info #8809

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c88437
restore .names["pkg_config"]
SpaceIm Jan 11, 2022
7fe376c
add ALSA_CONFIG_DIR to runenv_info
SpaceIm Jan 11, 2022
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
11 changes: 7 additions & 4 deletions recipes/libalsa/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,13 @@ def package_info(self):
self.cpp_info.set_property("cmake_file_name", "ALSA")
self.cpp_info.set_property("cmake_target_name", "ALSA::ALSA")
self.cpp_info.set_property("pkg_config_name", "alsa")
self.cpp_info.libs = ["asound"]
self.cpp_info.system_libs = ["dl", "m", "rt", "pthread"]
alsa_config_dir = os.path.join(self.package_folder, "res", "alsa")
self.runenv_info.define_path("ALSA_CONFIG_DIR", alsa_config_dir)

# TODO: to remove in conan v2?
self.cpp_info.names["cmake_find_package"] = "ALSA"
self.cpp_info.names["cmake_find_package_multi"] = "ALSA"

self.cpp_info.libs = ["asound"]
self.cpp_info.system_libs = ["dl", "m", "rt", "pthread"]
self.env_info.ALSA_CONFIG_DIR = os.path.join(self.package_folder, "res", "alsa")
self.cpp_info.names["pkg_config"] = "alsa"
self.env_info.ALSA_CONFIG_DIR = alsa_config_dir