[vlc-commits] Contribs: unrestrict CMake toolchain in native case

Jean-Baptiste Kempf git at videolan.org
Tue Nov 28 10:26:23 CET 2017


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Nov 28 10:23:40 2017 +0100| [5cee58c749233b862812e3e9170af05013c40990] | committer: Jean-Baptiste Kempf

Contribs: unrestrict CMake toolchain in native case

We can use the native libraries when building a CMake project, like
taglib or srt

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

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

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index ba97ba329b..7fb8f9bff4 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -502,8 +502,10 @@ endif
 	echo "set(CMAKE_CXX_COMPILER $(CXX))" >> $@
 	echo "set(CMAKE_FIND_ROOT_PATH $(PREFIX))" >> $@
 	echo "set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)" >> $@
+ifdef HAVE_CROSS_COMPILE
 	echo "set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)" >> $@
 	echo "set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)" >> $@
+endif
 
 # Default pattern rules
 .sum-%: $(SRC)/%/SHA512SUMS



More information about the vlc-commits mailing list