[vlc-commits] [Git][videolan/vlc][master] contrib: let Meson find CMake packages

[Rémi Denis-Courmont (@Courmisch)]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
b4d3804d by Steve Lhomme at 2022-09-09T17:23:23+00:00
contrib: let Meson find CMake packages

libplacebo should be able to find glslang that way since it doesn't export a
pkg-config file.

- - - - -


2 changed files:

- contrib/src/gen-meson-crossfile.py
- contrib/src/main.mak


Changes:

=====================================
contrib/src/gen-meson-crossfile.py
=====================================
@@ -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')
+


=====================================
contrib/src/main.mak
=====================================
@@ -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)
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/b4d3804dde0d24ff49039bbb4b9b18c0172c2693

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/b4d3804dde0d24ff49039bbb4b9b18c0172c2693
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance