CVS commit: pkgsrc/mk/configure

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

Module Name:    pkgsrc
Committed By:   gdt
Date:           Tue Aug 20 22:28:01 UTC 2024

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

Log Message:
mk/configure/cmake.mk: Use CMAKE_CONFIGURE_ARGS

We have a messy situation where cmake/build.mk uses
CMAKE_CONFIGURE_ARGS and USE_CMAKE uses CMAKE_ARGS.  While
CMAKE_CONFIGURE_ARGS defaults to CMAKE_ARGS, it's troule if both are
defined.

As part of a plan to remove USE_CMAKE eventually, make USE_CMAKE
respect CMAKE_CONFIGURE_ARGS if set.   Then, we can change
e.g. lang/python/pyversion.mk to set CMAKE_CONFIGURE_ARGS instead of
CMAKE_ARGS, fixing latent bugs with packages converted to cmake.mk,
and gradually reducing confusion.

This choice leans to putting ick in the USE_CMAKE world, on the theory
that it's getting smaller.


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

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

Modified files:

Index: pkgsrc/mk/configure/cmake.mk
diff -u pkgsrc/mk/configure/cmake.mk:1.26 pkgsrc/mk/configure/cmake.mk:1.27
--- pkgsrc/mk/configure/cmake.mk:1.26   Mon Aug 19 17:07:22 2024
+++ pkgsrc/mk/configure/cmake.mk        Tue Aug 20 22:28:01 2024
@@ -1,4 +1,4 @@
-# $NetBSD: cmake.mk,v 1.26 2024/08/19 17:07:22 gdt Exp $
+# $NetBSD: cmake.mk,v 1.27 2024/08/20 22:28:01 gdt Exp $
 
 # WARNING: This file is part of "USE_CMAKE", which is deprecated and
 # should not be used.  However, it has not yet been deleted because
@@ -59,6 +59,10 @@ CMAKE_USE_GNU_INSTALL_DIRS?= yes
 CMAKE_INSTALL_PREFIX?= ${PREFIX}
 CMAKE_INSTALL_NAME_DIR?=${PREFIX}/lib
 
+# To accomodate packages that include mk files across a
+# build.mk/USE_CMAKE boundary, merge in any CMAKE_CONFIGURE_ARGS.
+CMAKE_ARGS+=   ${CMAKE_CONFIGURE_ARGS}
+
 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])