Thu Jan 12 19:37:35 2023 UTC ()
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


(markd)
diff -r1.31 -r1.32 pkgsrc/mk/configure/configure.mk
cvs diff -r1.31 -r1.32 pkgsrc/mk/configure/configure.mk (expand / switch to context diff)
--- pkgsrc/mk/configure/configure.mk 2020/02/23 20:24:46 1.31
+++ pkgsrc/mk/configure/configure.mk 2023/01/12 19:37:35 1.32
@@ -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 =
 #
@@ -84,6 +84,9 @@
 .endif
 .if defined(USE_CMAKE)
 .  include "cmake.mk"
+.endif
+.if defined(_CMAKE_CONFIGURE_SETTINGS)
+.  include "../../devel/cmake/configure-settings.mk"
 .endif
 
 ######################################################################