move build-gtest-gmock into the Makefile

4 years ago · bbc84f6f33
parent 1865e33426
commit bbc84f6f33
2 changed files with 4 additions and 5 deletions
--- a/4
+++ b/4
@ -70,3 +70,7 @@ $(info )
 endif

 include $(BOARD_HARDWARE_PATH)/$(KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR)/rules.mk
+
+build-gtest-gmock:
+	(cd testing/googletest && cmake .)
+	$(MAKE) -C testing/googletest
--- a/bin/kaleidoscope-builder
+++ b/bin/kaleidoscope-builder
@ -592,11 +592,6 @@ EOF
    fi
 }

-build_gtest_gmock() {
-    kaleidoscope_dir="$(dirname "$0")/.."
-    (cd "${kaleidoscope_dir}/testing/googletest" && cmake . && make)
-}
-
 run_tests() {
    (cd "${BOARD_HARDWARE_PATH}/keyboardio" && make prepare-virtual)
    build_gtest_gmock