[vlc-commits] contrib: only set CMAKE_DEBUG_POSTFIX for windows targets

Steve Lhomme git at videolan.org
Tue Jul 7 09:10:27 CEST 2020


vlc/vlc-3.0 | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Wed Jan 29 13:37:06 2020 +0100| [79d8ea900f6736bf6e01501e07a3bac46a13f278] | committer: Steve Lhomme

contrib: only set CMAKE_DEBUG_POSTFIX for windows targets

For other targets it's not needed and creates a warning.

(cherry picked from commit 542d7a797a803cbfeb6c93aad9d16be215d8fecb) (rebased)

rebased:
- the MSYS detection is different in this branch

Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

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

 contrib/src/main.mak | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 0fa14b8322..ca5c5f4312 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -384,7 +384,10 @@ endif
 RECONF = mkdir -p -- $(PREFIX)/share/aclocal && \
 	cd $< && $(AUTORECONF) -fiv $(ACLOCAL_AMFLAGS)
 CMAKE = cmake . -DCMAKE_TOOLCHAIN_FILE=$(abspath toolchain.cmake) \
-		-DCMAKE_INSTALL_PREFIX=$(PREFIX) $(CMAKE_GENERATOR) -DCMAKE_DEBUG_POSTFIX:STRING=
+		-DCMAKE_INSTALL_PREFIX=$(PREFIX) $(CMAKE_GENERATOR)
+ifdef HAVE_WIN32
+CMAKE += -DCMAKE_DEBUG_POSTFIX:STRING=
+endif
 ifeq ($(findstring mingw32,$(BUILD)),mingw32)
 CMAKE += -DCMAKE_LINK_LIBRARY_SUFFIX:STRING=.a
 endif



More information about the vlc-commits mailing list