[vlc-commits] contrib: escape DarwinOS compilation flags to fix installations with cmake

Felix Paul Kühne git at videolan.org
Sat May 26 18:38:58 CEST 2018


vlc/vlc-3.0 | branch: master | Felix Paul Kühne <felix at feepk.net> | Sat May 26 18:22:54 2018 +0200| [d25b4ac711617bbc5768110ab60bebd6b8aef984] | committer: Felix Paul Kühne

contrib: escape DarwinOS compilation flags to fix installations with cmake

(cherry picked from commit 20f27d6ccc97c139caf8c7a16808ace25a625bb9)

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

 contrib/src/main.mak | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index f43bf03d70..6c3b02d0d6 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -472,9 +472,9 @@ endif
 endif
 ifdef HAVE_DARWIN_OS
 	echo "set(CMAKE_SYSTEM_NAME Darwin)" >> $@
-	echo "set(CMAKE_C_FLAGS $(CFLAGS) $(EXTRA_CFLAGS))" >> $@
-	echo "set(CMAKE_CXX_FLAGS $(CFLAGS) $(EXTRA_CXXFLAGS))" >> $@
-	echo "set(CMAKE_LD_FLAGS $(LDFLAGS))" >> $@
+	echo "set(CMAKE_C_FLAGS \"$(CFLAGS) $(EXTRA_CFLAGS)\")" >> $@
+	echo "set(CMAKE_CXX_FLAGS \"$(CFLAGS) $(EXTRA_CXXFLAGS)\")" >> $@
+	echo "set(CMAKE_LD_FLAGS \"$(LDFLAGS)\")" >> $@
 	echo "set(CMAKE_AR ar CACHE FILEPATH "Archiver")" >> $@
 ifdef HAVE_IOS
 	echo "set(CMAKE_OSX_SYSROOT $(IOS_SDK))" >> $@



More information about the vlc-commits mailing list