CVS commit: pkgsrc/devel/meson

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Thu Oct 24 09:19:02 UTC 2019

Modified Files:
        pkgsrc/devel/meson: build.mk

Log Message:
meson: don't expose cmake if the package didn't also set USE_CMAKE


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/meson/build.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/meson/build.mk
diff -u pkgsrc/devel/meson/build.mk:1.2 pkgsrc/devel/meson/build.mk:1.3
--- pkgsrc/devel/meson/build.mk:1.2     Sat Oct  5 20:09:52 2019
+++ pkgsrc/devel/meson/build.mk Thu Oct 24 09:19:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: build.mk,v 1.2 2019/10/05 20:09:52 nia Exp $
+# $NetBSD: build.mk,v 1.3 2019/10/24 09:19:02 tnn Exp $
 
 BUILD_DEPENDS+=        meson-[0-9]*:../../devel/meson
 
@@ -13,6 +13,10 @@ INSTALL_DIRS?=               ${CONFIGURE_DIRS}
 MAKE_ENV+=     LLVM_CONFIG_PATH=${LLVM_CONFIG_PATH:Q}
 .endif
 
+.if !defined(USE_CMAKE)
+MAKE_ENV+=     CMAKE=${TOOLS_PATH.false}
+.endif
+
 do-configure: meson-configure
 meson-configure:
 .for d in ${CONFIGURE_DIRS}