[vlc-commits] [Git][videolan/vlc][master] 2 commits: contrib: cmake: set CMAKE_SYSTEM_NAME on Linux

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

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


Commits:
485a809c by Rémi Denis-Courmont at 2022-01-21T18:36:50+00:00
contrib: cmake: set CMAKE_SYSTEM_NAME on Linux

- - - - -
f2e67d22 by Rémi Denis-Courmont at 2022-01-21T18:36:50+00:00
contrib: cmake: require a system name

Cross-compilation will fail if the system name is not specified, because
such is CMake's design.

- - - - -


1 changed file:

- contrib/src/main.mak


Changes:

=====================================
contrib/src/main.mak
=====================================
@@ -550,6 +550,12 @@ help:
 .PHONY: all fetch fetch-all install mostlyclean clean distclean package list help prebuilt
 
 CMAKE_SYSTEM_NAME =
+ifdef HAVE_CROSS_COMPILE
+CMAKE_SYSTEM_NAME = $(error CMAKE_SYSTEM_NAME required for cross-compilation)
+endif
+ifdef HAVE_LINUX
+CMAKE_SYSTEM_NAME = Linux
+endif
 ifdef HAVE_WIN32
 CMAKE_SYSTEM_NAME = Windows
 ifdef HAVE_VISUALSTUDIO



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/6df8b912da36e22039bd349262562a1ae8057670...f2e67d22ff313ce44bd60cd534d51ff529ffda00

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/6df8b912da36e22039bd349262562a1ae8057670...f2e67d22ff313ce44bd60cd534d51ff529ffda00
You're receiving this email because of your account on code.videolan.org.