mirror of
https://github.com/hyprwm/Hyprland
synced 2024-11-22 09:05:59 +01:00
pkg-config -> pkgconf for hyprpm and cmake
This commit is contained in:
parent
125a8f7e07
commit
0457c2e348
2 changed files with 2 additions and 2 deletions
|
@ -69,7 +69,7 @@ ExternalProject_Add(
|
||||||
find_program(WaylandScanner NAMES wayland-scanner)
|
find_program(WaylandScanner NAMES wayland-scanner)
|
||||||
message(STATUS "Found WaylandScanner at ${WaylandScanner}")
|
message(STATUS "Found WaylandScanner at ${WaylandScanner}")
|
||||||
execute_process(
|
execute_process(
|
||||||
COMMAND pkg-config --variable=pkgdatadir wayland-protocols
|
COMMAND pkgconf --variable=pkgdatadir wayland-protocols
|
||||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
||||||
OUTPUT_VARIABLE WAYLAND_PROTOCOLS_DIR
|
OUTPUT_VARIABLE WAYLAND_PROTOCOLS_DIR
|
||||||
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||||
|
|
|
@ -317,7 +317,7 @@ eHeadersErrors CPluginManager::headersValid() {
|
||||||
return HEADERS_MISSING;
|
return HEADERS_MISSING;
|
||||||
|
|
||||||
// find headers commit
|
// find headers commit
|
||||||
std::string cmd = std::format("PKG_CONFIG_PATH=\"{}/share/pkgconfig\" pkg-config --cflags --keep-system-cflags hyprland", DataState::getHeadersPath());
|
std::string cmd = std::format("PKG_CONFIG_PATH=\"{}/share/pkgconfig\" pkgconf --cflags --keep-system-cflags hyprland", DataState::getHeadersPath());
|
||||||
auto headers = execAndGet(cmd.c_str());
|
auto headers = execAndGet(cmd.c_str());
|
||||||
|
|
||||||
if (!headers.contains("-I/"))
|
if (!headers.contains("-I/"))
|
||||||
|
|
Loading…
Reference in a new issue