[vlc-commits] contrib: only set the CMAKE_SYSTEM_NAME when building with MSVC

Steve Lhomme git at videolan.org
Thu Jun 18 18:31:41 CEST 2020


vlc/vlc-3.0 | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Mon Mar  4 13:17:51 2019 +0100| [5e7c7ab3804c9e546b92c4f80f2244a490d53ce4] | committer: Steve Lhomme

contrib: only set the CMAKE_SYSTEM_NAME when building with MSVC

(cherry picked from commit 828a65f3a1193d0e2e492c4139db5314b90a3b56)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=5e7c7ab3804c9e546b92c4f80f2244a490d53ce4
---

 contrib/src/main.mak | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index dbdedb9181..1d21f394ee 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -515,6 +515,7 @@ else
 endif
 	echo "set(CMAKE_SYSTEM_PROCESSOR $(ARCH))" >> $@
 ifdef HAVE_WIN32
+ifdef HAVE_VISUALSTUDIO
 ifdef HAVE_WINDOWSPHONE
 	echo "set(CMAKE_SYSTEM_NAME WindowsPhone)" >> $@
 else
@@ -524,6 +525,7 @@ else
 	echo "set(CMAKE_SYSTEM_NAME Windows)" >> $@
 endif
 endif
+endif
 ifdef HAVE_CROSS_COMPILE
 	echo "set(CMAKE_RC_COMPILER $(WINDRES))" >> $@
 endif



More information about the vlc-commits mailing list