Tue Aug 9 21:45:08 2022 UTC ()
ke/build.mk: use ${TEST_TARGET} and ${INSTALL_TARGET}

Noted by adam@


(wiz)
diff -r1.1 -r1.2 pkgsrc/devel/cmake/build.mk
cvs diff -r1.1 -r1.2 pkgsrc/devel/cmake/build.mk (expand / switch to unified diff)

--- pkgsrc/devel/cmake/build.mk 2022/08/09 16:08:43 1.1
+++ pkgsrc/devel/cmake/build.mk 2022/08/09 21:45:08 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: build.mk,v 1.1 2022/08/09 16:08:43 wiz Exp $ 1# $NetBSD: build.mk,v 1.2 2022/08/09 21:45:08 wiz Exp $
2# 2#
3# This Makefile fragment supports building using the CMake build tool. 3# This Makefile fragment supports building using the CMake build tool.
4# 4#
5# User-settable variables: 5# User-settable variables:
6# 6#
7# CMAKE_GENERATOR 7# CMAKE_GENERATOR
8# Which build tool to use. 8# Which build tool to use.
9# 9#
10# Possible: make ninja 10# Possible: make ninja
11# Default: make 11# Default: make
12# 12#
13# Package-settable variables: 13# Package-settable variables:
14# 14#
@@ -80,23 +80,23 @@ cmake-configure: @@ -80,23 +80,23 @@ cmake-configure:
80do-build: cmake-build 80do-build: cmake-build
81cmake-build: 81cmake-build:
82.for d in ${BUILD_DIRS} 82.for d in ${BUILD_DIRS}
83 ${RUN} cd ${WRKSRC}/${d}/${CMAKE_BUILD_DIR} && \ 83 ${RUN} cd ${WRKSRC}/${d}/${CMAKE_BUILD_DIR} && \
84 ${SETENV} ${MAKE_ENV} \ 84 ${SETENV} ${MAKE_ENV} \
85 ${_CMAKE_BUILD_TOOL} ${CMAKE_BUILD_ARGS} 85 ${_CMAKE_BUILD_TOOL} ${CMAKE_BUILD_ARGS}
86.endfor 86.endfor
87 87
88do-test: cmake-test 88do-test: cmake-test
89cmake-test: 89cmake-test:
90.for d in ${TEST_DIRS} 90.for d in ${TEST_DIRS}
91 ${RUN} cd ${WRKSRC}/${d}/${CMAKE_BUILD_DIR} && \ 91 ${RUN} cd ${WRKSRC}/${d}/${CMAKE_BUILD_DIR} && \
92 ${SETENV} ${TEST_ENV} \ 92 ${SETENV} ${TEST_ENV} \
93 ${_CMAKE_BUILD_TOOL} ${CMAKE_BUILD_ARGS} test 93 ${_CMAKE_BUILD_TOOL} ${CMAKE_BUILD_ARGS} ${TEST_TARGET}
94.endfor 94.endfor
95 95
96do-install: cmake-install 96do-install: cmake-install
97cmake-install: 97cmake-install:
98.for d in ${INSTALL_DIRS} 98.for d in ${INSTALL_DIRS}
99 ${RUN} cd ${WRKSRC}/${d}/${CMAKE_BUILD_DIR} && \ 99 ${RUN} cd ${WRKSRC}/${d}/${CMAKE_BUILD_DIR} && \
100 ${SETENV} ${INSTALL_ENV} \ 100 ${SETENV} ${INSTALL_ENV} \
101 ${_CMAKE_BUILD_TOOL} ${CMAKE_INSTALL_ARGS} install 101 ${_CMAKE_BUILD_TOOL} ${CMAKE_INSTALL_ARGS} ${INSTALL_TARGET}
102.endfor 102.endfor