vlc/vlc-3.0 | branch: master | Steve Lhomme <[email protected]> | Fri Feb 15 16:15:49 2019 +0100| [c9b72a16a618a451e411cbb108b733dfdfc939c8] | committer: Steve Lhomme
contrib: fix the CMake cross compilation path in msys2 CMake doesn't recognize the msys pathes on Windows (even though it's build from contribs). (cherry picked from commit 82f242fee378fb96f15c54de77340afdc19dd557) Signed-off-by: Steve Lhomme <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=c9b72a16a618a451e411cbb108b733dfdfc939c8 --- contrib/src/main.mak | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contrib/src/main.mak b/contrib/src/main.mak index 7117d78a4f..dbdedb9181 100644 --- a/contrib/src/main.mak +++ b/contrib/src/main.mak @@ -553,7 +553,11 @@ endif endif echo "set(CMAKE_C_COMPILER $(CC))" >> $@ echo "set(CMAKE_CXX_COMPILER $(CXX))" >> $@ +ifeq ($(findstring msys,$(BUILD)),msys) + echo "set(CMAKE_FIND_ROOT_PATH `cygpath -m $(PREFIX)`)" >> $@ +else echo "set(CMAKE_FIND_ROOT_PATH $(PREFIX))" >> $@ +endif echo "set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)" >> $@ ifdef HAVE_CROSS_COMPILE echo "set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)" >> $@ _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
