Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 18 May 2021 00:55:04 GMT
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 67a311cc56e2 - main - graphics/shaderc: convert TEST option to USES=cmake:testing
Message-ID:  <202105180055.14I0t48t047205@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=67a311cc56e21cb7921b2bdf6c6409297aa8ee70

commit 67a311cc56e21cb7921b2bdf6c6409297aa8ee70
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2021-05-17 13:35:57 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2021-05-18 00:47:15 +0000

    graphics/shaderc: convert TEST option to USES=cmake:testing
---
 graphics/shaderc/Makefile | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/graphics/shaderc/Makefile b/graphics/shaderc/Makefile
index be743bb4a0fe..4bc3a3603c7a 100644
--- a/graphics/shaderc/Makefile
+++ b/graphics/shaderc/Makefile
@@ -10,22 +10,19 @@ LICENSE=	APACHE20
 
 BUILD_DEPENDS=	glslang>0:graphics/glslang \
 		spirv-tools>0:graphics/spirv-tools
+TEST_DEPENDS=	googletest>0:devel/googletest
 
-USES=		cmake compiler:c++11-lib localbase:ldflags python:3.4+,build
+USES=		cmake:testing compiler:c++11-lib localbase:ldflags python:3.4+,build
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 GH_ACCOUNT=	google
 GH_TUPLE=	KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-47-gdafead1:headers/third_party/spirv-headers
+CMAKE_ON+=	${CMAKE_TESTING_OFF}
+CMAKE_TESTING_OFF=	SHADERC_SKIP_TESTS
 CMAKE_ARGS=	-Dglslang_SOURCE_DIR:PATH="${LOCALBASE}/include/glslang" \
 		-DSPIRV-Headers_SOURCE_DIR:PATH="${WRKSRC}/third_party/spirv-headers"
 LDFLAGS+=	-Wl,-z,defs # glslang
 
-OPTIONS_DEFINE=	TEST
-
-TEST_BUILD_DEPENDS=	googletest>0:devel/googletest
-TEST_TEST_TARGET=	test
-TEST_CMAKE_BOOL_OFF=	SHADERC_SKIP_TESTS
-
 post-patch:
 # Disable bundled dependencies
 	${REINPLACE_CMD} '/third_party/d' ${WRKSRC}/CMakeLists.txt
@@ -40,6 +37,4 @@ pre-configure:
 	${ECHO_CMD} "\"`${PKG_BIN} query '%n v%v' spirv-tools`\n\"" >> ${WRKSRC}/glslc/src/build-version.inc
 	${ECHO_CMD} "\"`${PKG_BIN} query '%n %v' glslang`\n\"" >> ${WRKSRC}/glslc/src/build-version.inc
 
-pre-install-TEST-on:	do-test
-
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105180055.14I0t48t047205>