From c0208be2fdd6d30d59b534b848c1f4ce39a764d5 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Wed, 27 May 2020 14:24:22 -0400 Subject: Update to use CMake app template Rework CMake files to actually use the CMake app template macros, with an update of the autobuild script to fix test widget building to match the state of the other bindings. Bug-AGL: SPEC-2049 Signed-off-by: Scott Murray Change-Id: I88c438ed4dafd631646769d7b6dc3debd1ccd6de --- autobuild/agl/autobuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'autobuild') diff --git a/autobuild/agl/autobuild b/autobuild/agl/autobuild index 994ca4b..7816b3d 100755 --- a/autobuild/agl/autobuild +++ b/autobuild/agl/autobuild @@ -23,7 +23,7 @@ BUILD_DIR_DEBUG_TEST := $(abspath $(dir $(THISFILE))/../../build-debug-test) BUILD_DIR_COVERAGE_TEST := $(abspath $(dir $(THISFILE))/../../build-coverage-test) DEST := ${BUILD_DIR} -.PHONY: all clean distclean configure build package help update configure-debug configure-coverage build-test build-debug build-coverage package-test package-debug package-coverage package-debug package-debug-test package-coverage-test package-all +.PHONY: all clean distclean configure build package help update configure-debug configure-coverage build-debug build-coverage package-test package-debug package-coverage package-debug package-debug-test package-coverage-test package-all all: help help: @@ -95,6 +95,7 @@ package-test: build-test @mkdir -p ${BUILD_DIR_TEST}/$@/htdocs @mkdir -p ${BUILD_DIR_TEST}/$@/var @cmake --build ${BUILD_DIR_TEST} ${PACKAGE_ARGS} --target widget + @cmake --build ${BUILD_DIR_TEST} ${PACKAGE_ARGS} --target test_widget @if [ "${DEST}" != "${BUILD_DIR_TEST}" ]; then \ mkdir -p ${DEST} && cp ${BUILD_DIR_TEST}/*.wgt ${DEST}; \ fi -- cgit 1.2.3-korg