Skip to content

pkgconfig variables support in CMake toolchain file #17101

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
merged 10 commits into from
May 31, 2022
+37 −1
Merged

pkgconfig variables support in CMake toolchain file #17101

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5c1f039
Drafted pkgconfig variables support in CMake toolchain file
nthirtyone May 29, 2022
cc7b0f7
Added test for pc files finding via CMake
nthirtyone May 30, 2022
8bc8ec2
Removed {EM_,}PKG_CONFIG_PATH from toolchain
nthirtyone May 30, 2022
6e8ae1c
Fixed missing redirection from cmake run
nthirtyone May 30, 2022
f3a4d51
Added pkgconfiglite to choco packages for windows tests
nthirtyone May 30, 2022
d439aa8
Added pkg-config to Mac CI test environment
nthirtyone May 30, 2022
86b81fa
pkg-config test will now be skipped if no pkg-config
nthirtyone May 31, 2022
15f7812
Increased verbosity of CMake output for the pkg-config test
nthirtyone May 31, 2022
bfc2f5a
Test will now fail instead of skipping in case of missing pkg-config
nthirtyone May 31, 2022
e80be51
Merge remote-tracking branch 'origin/main' into pc-with-cmake
nthirtyone May 31, 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
14 changes: 14 additions & 0 deletions cmake/Modules/Platform/Emscripten.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,20 @@ if (NOT CMAKE_FIND_ROOT_PATH_MODE_PACKAGE)
set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
endif()

set(_em_pkgconfig_libdir "${EMSCRIPTEN_SYSROOT}/local/lib/pkgconfig" "${EMSCRIPTEN_SYSROOT}/lib/pkgconfig")
if("${CMAKE_VERSION}" VERSION_LESS "3.20")
file(TO_NATIVE_PATH "${_em_pkgconfig_libdir}" _em_pkgconfig_libdir)
if(CMAKE_HOST_UNIX)
string(REPLACE ";" ":" _em_pkgconfig_libdir "${_em_pkgconfig_libdir}")
string(REPLACE "\\ " " " _em_pkgconfig_libdir "${_em_pkgconfig_libdir}")
endif()
else()
cmake_path(CONVERT "${_em_pkgconfig_libdir}" TO_NATIVE_PATH_LIST _em_pkgconfig_libdir)
endif()
set(ENV{PKG_CONFIG_LIBDIR} "${_em_pkgconfig_libdir}")
Copy link
Collaborator

@sbc100 sbc100 May 31, 2022

Choose a reason for hiding this comment

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

I wonder if we should also set PKG_CONFIG_SYSROOT_DIR here? (doesn't have to be part of this change).

Copy link
Contributor Author

@nthirtyone nthirtyone May 31, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

I'd suggest to leave it out for now. We'd want to get consistent behaviour for CMake and building.py and PKG_CONFIG_SYSROOT_DIR can easily become a journey on its own (LIBDIR is good enough for most use cases, and SYSROOT affects only the PATH, not LIBDIR).

set(ENV{PKG_CONFIG_PATH} "$ENV{EM_PKG_CONFIG_PATH}") # Stops caller's PKG_CONFIG_PATH from propagating.
Copy link
Collaborator

@sbc100 sbc100 May 29, 2022

Choose a reason for hiding this comment

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

I think we should forget about EM_PKG_CONFIG_PATH. I'm not sure why use it ever had.

If somebody explicitly sets PKG_CONFIG_PATH when building an emscripten project I don't see why should ignore it. That seems like a deliberate act.

Copy link
Contributor Author

@nthirtyone nthirtyone May 30, 2022

Choose a reason for hiding this comment

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

This behaviour was based on tools.building.get_building_env().

I agree that it seems a bit out of place, but that would introduce inconsistency in how caller's variables are used across tools. If it's acceptable for you then I'm happy to do it.

Or should I update get_building_env? For example: create a backwards-compatible behaviour that prioritises EM_PKG_CONFIG_PATH but also allows for PKG_CONFIG_PATH, and then implement it consistently inget_building_env and here in toolchain.

Copy link
Collaborator

@sbc100 sbc100 May 30, 2022

Choose a reason for hiding this comment

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

I think you should ignore EM_PKG_CONFIG_PATH in this patch and we should try to remove it from get_building_env as separate change.

Copy link
Contributor Author

@nthirtyone nthirtyone May 30, 2022

Choose a reason for hiding this comment

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

Alright, removed the line in question.

unset(_em_pkgconfig_libdir)

option(EMSCRIPTEN_GENERATE_BITCODE_STATIC_LIBRARIES "If set, static library targets generate LLVM bitcode files (.bc). If disabled (default), UNIX ar archives (.a) are generated." OFF)
if (EMSCRIPTEN_GENERATE_BITCODE_STATIC_LIBRARIES)
message(FATAL_ERROR "EMSCRIPTEN_GENERATE_BITCODE_STATIC_LIBRARIES is not compatible with the llvm backend")
Expand Down