Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1673551957139790"
MIME-Version: 1.0
Date: Thu, 12 Jan 2023 19:32:37 +0000
From: "Mark Davies" <markd@netbsd.org>
Subject: CVS commit: pkgsrc/devel/cmake
To: pkgsrc-changes@NetBSD.org
Reply-To: markd@netbsd.org
Message-Id: <20230112193237.3BADCFA90@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1673551957139790
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

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

Modified Files:
	pkgsrc/devel/cmake: build.mk
Added Files:
	pkgsrc/devel/cmake: configure-settings.mk

Log Message:
cmake: copy mk/configure/cmake.mk to configure-settings.mk

for use with cmake/build.mk

Don't bother with CMAKE_DEPENDENCIES_REWRITE - only ever used by
kdelibs4 and kdepimlibs4

Don't bother with CMAKE_MODULE_PATH_OVERRIDE - doesn't appear to make
any functional difference these days.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/cmake/build.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/cmake/configure-settings.mk

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


--_----------=_1673551957139790
Content-Disposition: inline
Content-Length: 4350
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/devel/cmake/build.mk
diff -u pkgsrc/devel/cmake/build.mk:1.5 pkgsrc/devel/cmake/build.mk:1.6
--- pkgsrc/devel/cmake/build.mk:1.5	Wed Sep 28 10:05:35 2022
+++ pkgsrc/devel/cmake/build.mk	Thu Jan 12 19:32:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: build.mk,v 1.5 2022/09/28 10:05:35 markd Exp $
+# $NetBSD: build.mk,v 1.6 2023/01/12 19:32:37 markd Exp $
 #
 # This Makefile fragment supports building using the CMake build tool.
 #
@@ -65,6 +65,8 @@ BUILD_DIRS?=		${CONFIGURE_DIRS}
 TEST_DIRS?=		${CONFIGURE_DIRS}
 INSTALL_DIRS?=		${CONFIGURE_DIRS}
 
+_CMAKE_CONFIGURE_SETTINGS=	yes
+
 .PHONY: cmake-configure cmake-build cmake-test cmake-install
 
 do-configure: cmake-configure

Added files:

Index: pkgsrc/devel/cmake/configure-settings.mk
diff -u /dev/null pkgsrc/devel/cmake/configure-settings.mk:1.1
--- /dev/null	Thu Jan 12 19:32:37 2023
+++ pkgsrc/devel/cmake/configure-settings.mk	Thu Jan 12 19:32:37 2023
@@ -0,0 +1,86 @@
+# $NetBSD: configure-settings.mk,v 1.1 2023/01/12 19:32:37 markd Exp $
+#
+# This file handles packages that use CMake as their primary build
+# system. For more information about CMake, see http://www.cmake.org/.
+#
+# Package-settable variables:
+#
+# CMAKE_MODULE_PATH_OVERRIDE
+#	Deprecated
+#	A list of files relative to WRKSRC in which the CMAKE_MODULE_PATH
+#	variable is adjusted to include the path from the pkgsrc wrappers.
+#	The file ${WRKSRC}/CMakeLists.txt is always appended to this list.
+#
+# CMAKE_PKGSRC_BUILD_FLAGS
+#	If set to yes, disable compiler optimization flags associated
+#	with the CMAKE_BUILD_TYPE setting (for pkgsrc these come in from
+#	the user via variables like CFLAGS).  The default is yes, but you can
+#	set it to no for pkgsrc packages that do not use a compiler to avoid
+#	cmake "Manually-specified variables were not used by the project"
+#	warnings associated with this variable.
+#
+# CMAKE_PREFIX_PATH
+#	A list of directories to add the CMAKE_PREFIX_PATH cmake variable.
+#	If a package installs its contents in ${PREFIX}/package instead of
+#	${PREFIX} and it installs cmake modules there 
+#	"CMAKE_PREFIX_PATH += ${PREFIX}/package" should be in its 
+#	buildlink3.mk so that packages that depend on it can find its 
+#	cmake modules if they use cmake to build.
+#
+# CMAKE_USE_GNU_INSTALL_DIRS
+#	If set to yes, set GNU standard installation directories with pkgsrc
+#	configured settings.  The default is yes.
+#
+# CMAKE_INSTALL_PREFIX
+#	Destination directory to install software. The default is ${PREFIX}.
+#
+# CMAKE_INSTALL_NAME_DIR
+#       Destination directory to install shlibs, used by
+#       install_name_tool(1) on macOS. The default is ${PREFIX}/lib.
+#
+
+_CMAKE_MOD_DIR=	${BUILDLINK_DIR}/cmake-Modules
+
+.if !empty(USE_LANGUAGES) && ${INSTALL_UNSTRIPPED:Uno:tl} != yes
+INSTALL_TARGET?=	install/strip
+.endif
+
+CMAKE_USE_GNU_INSTALL_DIRS?=	yes
+
+CMAKE_INSTALL_PREFIX?=	${PREFIX}
+CMAKE_INSTALL_NAME_DIR?=${PREFIX}/lib
+
+CMAKE_CONFIGURE_ARGS+=	-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
+.if empty(CMAKE_PKGSRC_BUILD_FLAGS:M[nN][oO])
+CMAKE_CONFIGURE_ARGS+=    -DCMAKE_PKGSRC_BUILD_FLAGS:BOOL=TRUE
+.endif
+
+.if ${OPSYS} != "Darwin"
+# Arguably, we should pass CMAKE_BUILD_RPATH and CMAKE_INSTALL_RPATH
+# both equal to ${PREFIX}/lib, and omit -Wl,-R from LDFLAGS, to align
+# with how cmake thinks RPATH should be handled, but that is a
+# somewhat risky change.
+CMAKE_CONFIGURE_ARGS+=	-DCMAKE_SKIP_RPATH:BOOL=TRUE
+.else
+# TODO: Explain this better.
+CMAKE_CONFIGURE_ARGS+=	-DCMAKE_SKIP_RPATH:BOOL=FALSE
+CMAKE_CONFIGURE_ARGS+=	-DCMAKE_INSTALL_NAME_DIR:PATH=${CMAKE_INSTALL_NAME_DIR}
+.endif
+
+.if defined(CMAKE_USE_GNU_INSTALL_DIRS) && empty(CMAKE_USE_GNU_INSTALL_DIRS:M[nN][oO])
+CMAKE_CONFIGURE_ARGS+=	-DCMAKE_INSTALL_LIBDIR:PATH=lib
+CMAKE_CONFIGURE_ARGS+=	-DCMAKE_INSTALL_MANDIR:PATH=${PKGMANDIR}
+.  if defined(INFO_FILES)
+CMAKE_CONFIGURE_ARGS+=	-DCMAKE_INSTALL_INFODIR:PATH=${PKGINFODIR}
+.  endif
+.  if defined(USE_PKGLOCALEDIR) && empty(USE_PKGLOCALEDIR:M[nN][oO])
+CMAKE_CONFIGURE_ARGS+=	-DCMAKE_INSTALL_LOCALEDIR:PATH=${PKGLOCALEDIR}/locale
+.  endif
+.endif
+.if !empty(MACHINE_PLATFORM:MDarwin-*-aarch64)
+CMAKE_CONFIGURE_ARGS+=	-DCMAKE_APPLE_SILICON_PROCESSOR=arm64
+.endif
+
+.if defined(CMAKE_PREFIX_PATH)
+CMAKE_CONFIGURE_ARGS+=-DCMAKE_PREFIX_PATH:PATH=${CMAKE_PREFIX_PATH:ts;:Q}
+.endif


--_----------=_1673551957139790--