From b7224d6da36d5c42d6c206eb2b019e3acc20bbb5 Mon Sep 17 00:00:00 2001 From: Michael James Gratton Date: Mon, 26 Dec 2016 10:31:02 +1030 Subject: [PATCH] Stop cmake warning that we are using an internal target name. * CMakeLists.txt: Rename "test" to "tests" * Makefile.in: Chase target name, add a compatibility target for the old name. --- CMakeLists.txt | 6 +++--- Makefile.in | 10 +++++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0d091bd0..09146f66 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -151,9 +151,9 @@ include(GlibCompileResourcesSupport) # Unit tests. # # We don't use CMake's enable_testing/add_test built-ins because they -# use ctest. -add_custom_target(test ALL geary-test) -add_dependencies(test geary-test) +# use ctest. It's not called "test" because that is cmake reserved. +add_custom_target(tests ALL geary-test) +add_dependencies(tests geary-test) # # Uninstall target diff --git a/Makefile.in b/Makefile.in index 81575c66..61a97309 100644 --- a/Makefile.in +++ b/Makefile.in @@ -37,12 +37,16 @@ distclean: clean @-rm -rf $(BUILD_DIR) @-rm -f Makefile -.PHONY: test -test: +.PHONY: tests +tests: @$(MAKE) -C $(BUILD_DIR) $@ +.PHONY: test +test: + @$(MAKE) -C $(BUILD_DIR) tests + .PHONY: dist -dist: test +dist: tests @$(MAKE) -C $(BUILD_DIR) dist @cp build/*.xz .