CVS commit: pkgsrc/devel/cmake

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Tue Aug 20 12:09:55 UTC 2024

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

Log Message:
cmake/build.mk: Add caution about CMAKE_ARGS default

If, due to inclusion, both CMAKE_ARGS and CMAKE_CONFIGURE_ARGS are
defined, CMAKE_ARGS is ignored (rather than merged in).


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/cmake/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/cmake/build.mk
diff -u pkgsrc/devel/cmake/build.mk:1.15 pkgsrc/devel/cmake/build.mk:1.16
--- pkgsrc/devel/cmake/build.mk:1.15    Tue Aug 20 12:06:57 2024
+++ pkgsrc/devel/cmake/build.mk Tue Aug 20 12:09:55 2024
@@ -1,4 +1,4 @@
-# $NetBSD: build.mk,v 1.15 2024/08/20 12:06:57 gdt Exp $
+# $NetBSD: build.mk,v 1.16 2024/08/20 12:09:55 gdt Exp $
 #
 # This Makefile fragment supports building using the CMake build tool.
 #
@@ -23,6 +23,10 @@
 # CMAKE_CONFIGURE_ARGS
 #      Arguments to pass to CMake during the configure stage. Defaults
 #      to CMAKE_ARGS for backwards compatibility with USE_CMAKE.
+#       NB: "Defaults to" really means "if not defined", not
+#       "CMAKE_ARGS are merged in".  The point is that with mixed
+#       CMAKE_ARGS and CMAKE_CONFIGURE_ARGS, the value of CMAKE_ARGS
+#       is ignored.
 #
 # CMAKE_BUILD_ARGS
 #      Arguments to pass to CMake during build. Default: empty