Index: head/Mk/Uses/cmake.mk
===================================================================
--- head/Mk/Uses/cmake.mk	(revision 569550)
+++ head/Mk/Uses/cmake.mk	(revision 569551)
@@ -1,143 +1,164 @@
 # $FreeBSD$
 #
 # Provide support for CMake based projects
 #
 # Feature:		cmake
 # Usage:		USES=cmake or USES=cmake:ARGS
-# Valid ARGS:		insource, run, noninja
+# Valid ARGS:		insource, run, noninja, testing
 # ARGS description:
 # insource		do not perform an out-of-source build
 # noninja		don't use ninja instead of make
 #			Setting this should be an exception, and hints to an issue
 #			inside the ports build system.
 #			A few corner cases never use ninja, and are handled, to reduce
 #			the usage of 'noninja'.:
 #				1) fortran ports
 #				2) ports that set BUILD_- or INSTALL_WRKSRC to
 #				   something different than CONFIGURE_WRKSRC
 # run			add a runtime dependency on cmake
+# testing		add the test target based on ctest
+#			Additionally, CMAKE_TESTING_ON, CMAKE_TESTING_OFF, CMAKE_TESTING_ARGS, CMAKE_TESTING_TARGET
+#			can be defined to override the default values.
 #
 #
 # Additional variables that affect cmake behaviour:
 #
 # User defined variables:
 # CMAKE_NOCOLOR		- Disable colour build output
 #			Default: not set, unless BATCH or PACKAGE_BUILDING is defined
 #
 # Variables for ports:
 # CMAKE_ON		Appends -D<var>:bool=ON  to the CMAKE_ARGS,
 # CMAKE_OFF		Appends -D<var>:bool=OFF to the CMAKE_ARGS.
 # CMAKE_ARGS		- Arguments passed to cmake
 #			Default: see below
 # CMAKE_BUILD_TYPE	- Type of build (cmake predefined build types).
 #			Projects may have their own build profiles.
 #			CMake supports the following types: Debug,
 #			Release, RelWithDebInfo and MinSizeRel.
 #			Debug and Release profiles respect system
 #			CFLAGS, RelWithDebInfo and MinSizeRel will set
 #			CFLAGS to "-O2 -g" and "-Os -DNDEBUG".
 #			Default: Release, if WITH_DEBUG is not set,
 #			Debug otherwise
 # CMAKE_SOURCE_PATH	- Path to the source directory
 #			Default: ${WRKSRC}
 #
 # MAINTAINER: kde@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_CMAKE_MK)
 _INCLUDE_USES_CMAKE_MK=	yes
 
-_valid_ARGS=		insource run noninja
+_valid_ARGS=		insource run noninja testing
 
 # Sanity check
 .for arg in ${cmake_ARGS}
 .    if empty(_valid_ARGS:M${arg})
 IGNORE=	Incorrect 'USES+= cmake:${cmake_ARGS}' usage: argument [${arg}] is not recognized
 .    endif
 .endfor
 
 CMAKE_BIN=		${LOCALBASE}/bin/cmake
 BUILD_DEPENDS+=		${CMAKE_BIN}:devel/cmake
 
 .if ${cmake_ARGS:Mrun}
 RUN_DEPENDS+=		${CMAKE_BIN}:devel/cmake
 .endif
 
 .if defined(WITH_DEBUG)
 CMAKE_BUILD_TYPE?=	Debug
 .else
 CMAKE_BUILD_TYPE?=	Release
 .endif #defined(WITH_DEBUG)
 
 PLIST_SUB+=		CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:tl}"
 
 .if defined(STRIP) && ${STRIP} != "" && !defined(WITH_DEBUG)
 INSTALL_TARGET?=	install/strip
 .endif
 
 CMAKE_ARGS+=		-DCMAKE_C_COMPILER:STRING="${CC}" \
 			-DCMAKE_CXX_COMPILER:STRING="${CXX}" \
 			-DCMAKE_C_FLAGS:STRING="${CFLAGS}" \
 			-DCMAKE_C_FLAGS_DEBUG:STRING="${CFLAGS}" \
 			-DCMAKE_C_FLAGS_RELEASE:STRING="${CFLAGS}" \
 			-DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" \
 			-DCMAKE_CXX_FLAGS_DEBUG:STRING="${CXXFLAGS}" \
 			-DCMAKE_CXX_FLAGS_RELEASE:STRING="${CXXFLAGS}" \
 			-DCMAKE_EXE_LINKER_FLAGS:STRING="${LDFLAGS}" \
 			-DCMAKE_MODULE_LINKER_FLAGS:STRING="${LDFLAGS}" \
 			-DCMAKE_SHARED_LINKER_FLAGS:STRING="${LDFLAGS}" \
 			-DCMAKE_INSTALL_PREFIX:PATH="${CMAKE_INSTALL_PREFIX}" \
 			-DCMAKE_BUILD_TYPE:STRING="${CMAKE_BUILD_TYPE}" \
 			-DTHREADS_HAVE_PTHREAD_ARG:BOOL=YES \
 			-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=YES \
 			-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
 
 # Handle the option-like CMAKE_ON and CMAKE_OFF lists.
 .for _bool_kind in ON OFF
 .  if defined(CMAKE_${_bool_kind})
 CMAKE_ARGS+=		${CMAKE_${_bool_kind}:C/.*/-D&:BOOL=${_bool_kind}/}
 .  endif
 .endfor
 
 CMAKE_INSTALL_PREFIX?=	${PREFIX}
 
 .if defined(BATCH) || defined(PACKAGE_BUILDING)
 CMAKE_NOCOLOR=		yes
 .endif
 
 .if defined(CMAKE_NOCOLOR)
 CMAKE_ARGS+=		-DCMAKE_COLOR_MAKEFILE:BOOL=OFF
 .endif
 
 _CMAKE_MSG=		"===>  Performing in-source build"
 CMAKE_SOURCE_PATH?=	${WRKSRC}
 
 .if empty(cmake_ARGS:Minsource)
 _CMAKE_MSG=		"===>  Performing out-of-source build"
 CONFIGURE_WRKSRC=	${WRKDIR}/.build
 BUILD_WRKSRC?=		${CONFIGURE_WRKSRC}
 INSTALL_WRKSRC?=	${CONFIGURE_WRKSRC}
 TEST_WRKSRC?=		${CONFIGURE_WRKSRC}
 .endif
 
 # By default we use the ninja generator.
 #  Except, if cmake:run is set (cmake not wanted as generator)
 #             fortran is used, as the ninja-generator does not handle it.
 #             or if CONFIGURE_WRKSRC does not match  BUILD_WRKSRC or INSTALL_WRKSRC
 #             as the build.ninja file won't be where ninja expects it.
 .if empty(cmake_ARGS:Mnoninja) && empty(cmake_ARGS:Mrun) && empty(USES:Mfortran)
 .  if "${CONFIGURE_WRKSRC}" == "${BUILD_WRKSRC}" && "${CONFIGURE_WRKSRC}" == "${INSTALL_WRKSRC}"
 .    if ! empty(USES:Mgmake)
 BROKEN=		USES=gmake is incompatible with cmake's ninja-generator
 .    endif
 .      include "${USESDIR}/ninja.mk"
 .  endif
 .endif
 
 .if !target(do-configure)
 do-configure:
 	@${ECHO_MSG} ${_CMAKE_MSG}
 	${MKDIR} ${CONFIGURE_WRKSRC}
 	@cd ${CONFIGURE_WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_SOURCE_PATH}
+.endif
+
+.if !target(do-test) && ${cmake_ARGS:Mtesting}
+CMAKE_TESTING_ON?=		BUILD_TESTING
+CMAKE_TESTING_TARGET?=		test
+
+# Handle the option-like CMAKE_TESTING_ON and CMAKE_TESTING_OFF lists.
+.for _bool_kind in ON OFF
+.  if defined(CMAKE_TESTING_${_bool_kind})
+CMAKE_TESTING_ARGS+=		${CMAKE_TESTING_${_bool_kind}:C/.*/-D&:BOOL=${_bool_kind}/}
+.  endif
+.endfor
+
+do-test:
+	@cd ${BUILD_WRKSRC} && \
+		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_TESTING_ARGS} ${CMAKE_SOURCE_PATH} && \
+		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
+		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${CMAKE_TESTING_TARGET}
 .endif
 
 .endif #!defined(_INCLUDE_USES_CMAKE_MK)