CVS commit: pkgsrc/mk/configure

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Thu Jan 12 19:37:35 UTC 2023

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

Log Message:
configure.mk: include cmake/configure-settings.mk

when using cmake/build.mk include cmake/configure-settings.mk where
USE_CMAKE would have included cmake.mk


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/mk/configure/configure.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/configure.mk
diff -u pkgsrc/mk/configure/configure.mk:1.31 pkgsrc/mk/configure/configure.mk:1.32
--- pkgsrc/mk/configure/configure.mk:1.31       Sun Feb 23 20:24:46 2020
+++ pkgsrc/mk/configure/configure.mk    Thu Jan 12 19:37:35 2023
@@ -1,4 +1,4 @@
-# $NetBSD: configure.mk,v 1.31 2020/02/23 20:24:46 rillig Exp $
+# $NetBSD: configure.mk,v 1.32 2023/01/12 19:37:35 markd Exp $
 #
 # = Package-settable variables =
 #
@@ -85,6 +85,9 @@ _BUILD_DEFS+=         CONFIGURE_ENV CONFIGURE_A
 .if defined(USE_CMAKE)
 .  include "cmake.mk"
 .endif
+.if defined(_CMAKE_CONFIGURE_SETTINGS)
+.  include "../../devel/cmake/configure-settings.mk"
+.endif
 
 ######################################################################
 ### configure (PUBLIC)