pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/configure configure.mk: include cmake/configure-set...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/1b8a7449812c
branches:  trunk
changeset: 391714:1b8a7449812c
user:      markd <markd%pkgsrc.org@localhost>
date:      Thu Jan 12 19:37:35 2023 +0000

description:
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

diffstat:

 mk/configure/configure.mk |  5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diffs (19 lines):

diff -r 872668f95c23 -r 1b8a7449812c mk/configure/configure.mk
--- a/mk/configure/configure.mk Thu Jan 12 19:36:15 2023 +0000
+++ b/mk/configure/configure.mk Thu Jan 12 19:37:35 2023 +0000
@@ -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 @@
 .if defined(USE_CMAKE)
 .  include "cmake.mk"
 .endif
+.if defined(_CMAKE_CONFIGURE_SETTINGS)
+.  include "../../devel/cmake/configure-settings.mk"
+.endif
 
 ######################################################################
 ### configure (PUBLIC)



Home | Main Index | Thread Index | Old Index