Skip to content
Snippets Groups Projects
Commit b4d3804d authored by Steve Lhomme's avatar Steve Lhomme Committed by Rémi Denis-Courmont
Browse files

contrib: let Meson find CMake packages

libplacebo should be able to find glslang that way since it doesn't export a
pkg-config file.
parent ff3d43b9
No related branches found
No related tags found
1 merge request!2512contrib: let Meson find CMake packages
Pipeline #260748 passed with stage
in 14 minutes and 56 seconds
......@@ -62,3 +62,11 @@ args.file.write("endian = 'little'\n")
# Get first part of triplet
cpu = os.environ.get('HOST', '').split('-')[0]
args.file.write("cpu = '{}'\n".format(cpu))
# CMake section
args.file.write("\n[cmake]\n")
_add_environ_val('CMAKE_C_COMPILER', 'CC')
_add_environ_val('CMAKE_CXX_COMPILER', 'CXX')
_add_environ_val('CMAKE_SYSTEM_NAME', 'CMAKE_SYSTEM_NAME')
_add_environ_val('CMAKE_SYSTEM_PROCESSOR', 'ARCH')
......@@ -487,6 +487,8 @@ ifdef HAVE_CROSS_COMPILE
MESONFLAGS += --cross-file $(abspath crossfile.meson)
MESON = env -i PATH="$(PREFIX)/bin:$(PATH)" \
PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" \
CMAKE="$(command -v cmake)" \
CMAKE_PREFIX_PATH="$(PREFIX)" \
meson -Dpkg_config_path="$(PKG_CONFIG_PATH)" \
$(MESONFLAGS)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment