Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_152321468759660"
MIME-Version: 1.0
Date: Sun, 8 Apr 2018 19:11:27 +0000
From: "Chuck Cranor" <chuck@netbsd.org>
Subject: CVS commit: pkgsrc/mk/configure
To: pkgsrc-changes@NetBSD.org
Reply-To: chuck@netbsd.org
Message-Id: <20180408191127.73435FBEC@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_152321468759660
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	chuck
Date:		Sun Apr  8 19:11:27 UTC 2018

Modified Files:
	pkgsrc/mk/configure: cmake.mk

Log Message:
add support for CMAKE_PKGSRC_BUILD_FLAGS

CMAKE_PKGSRC_BUILD_FLAGS
     If set to yes, disable compiler optimization flags associated
     with the CMAKE_BUILD_TYPE setting (for pkgsrc these come in from
     the user via variables like CFLAGS).  The default is yes, but you can
     set it to no for pkgsrc packages that do not use a compiler to avoid
     cmake "Manually-specified variables were not used by the project"
     warnings associated with this variable.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/mk/configure/cmake.mk

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


--_----------=_152321468759660
Content-Disposition: inline
Content-Length: 1629
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/mk/configure/cmake.mk
diff -u pkgsrc/mk/configure/cmake.mk:1.15 pkgsrc/mk/configure/cmake.mk:1.16
--- pkgsrc/mk/configure/cmake.mk:1.15	Wed Dec 27 18:56:27 2017
+++ pkgsrc/mk/configure/cmake.mk	Sun Apr  8 19:11:27 2018
@@ -1,4 +1,4 @@
-# $NetBSD: cmake.mk,v 1.15 2017/12/27 18:56:27 wiz Exp $
+# $NetBSD: cmake.mk,v 1.16 2018/04/08 19:11:27 chuck Exp $
 #
 # This file handles packages that use CMake as their primary build
 # system. For more information about CMake, see http://www.cmake.org/.
@@ -15,6 +15,14 @@
 #	variable is adjusted to include the path from the pkgsrc wrappers.
 #	The file ${WRKSRC}/CMakeLists.txt is always appended to this list.
 #
+# CMAKE_PKGSRC_BUILD_FLAGS
+#	If set to yes, disable compiler optimization flags associated
+#	with the CMAKE_BUILD_TYPE setting (for pkgsrc these come in from
+#	the user via variables like CFLAGS).  The default is yes, but you can
+#	set it to no for pkgsrc packages that do not use a compiler to avoid
+#	cmake "Manually-specified variables were not used by the project"
+#	warnings associated with this variable.
+#
 # CMAKE_PREFIX_PATH
 #	A list of directories to add the CMAKE_PREFIX_PATH cmake variable.
 #	If a package installs its contents in ${PREFIX}/package instead of
@@ -39,6 +47,9 @@ CMAKE_INSTALL_PREFIX?=	${PREFIX}
 
 CMAKE_ARGS+=	-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
 CMAKE_ARGS+=	-DCMAKE_MODULE_PATH:PATH=${_CMAKE_DIR}
+.if empty(CMAKE_PKGSRC_BUILD_FLAGS:M[nN][oO])
+CMAKE_ARGS+=    -DCMAKE_PKGSRC_BUILD_FLAGS:BOOL=TRUE
+.endif
 .if ${OPSYS} != "Darwin"
 CMAKE_ARGS+=	-DCMAKE_SKIP_RPATH:BOOL=TRUE
 .else


--_----------=_152321468759660--