Hotfix for the macos compiler fixes for the virtual platform

pull/1133/head
Jesse Vincent 3 years ago
parent 1b3362341b
commit 275d45f479
No known key found for this signature in database
GPG Key ID: 122F5DF7108E4046

@ -58,7 +58,7 @@ run-tests: $(ARDUINO_DIRECTORIES_USER)/hardware/keyboardio/virtual/boards.txt bu
@: # blah @: # blah
build-gtest-gmock: build-gtest-gmock:
(cd testing/googletest && cmake -H. -Bbuild -DCMAKE_C_COMPILER=$(call _arduino_prop,compiler.path)/$(call _arduino_prop,compiler.c.cmd) -DCMAKE_CXX_COMPILER=$(call _arduino_prop,compiler.path)/$(call _arduino_prop,compiler.cpp.cmd) .) (cd testing/googletest && cmake -H. -Bbuild -DCMAKE_C_COMPILER=$(call _arduino_prop,compiler.path)$(call _arduino_prop,compiler.c.cmd) -DCMAKE_CXX_COMPILER=$(call _arduino_prop,compiler.path)$(call _arduino_prop,compiler.cpp.cmd) .)
$(MAKE) -C testing/googletest $(MAKE) -C testing/googletest
adjust-git-timestamps: adjust-git-timestamps:

@ -15,6 +15,7 @@ export FQBN ?= keyboardio:virtual:model01
TESTS ?= $(shell cd $(tests_dir); find ${TEST_PATH} -name '*.ino' -exec dirname {} \;) TESTS ?= $(shell cd $(tests_dir); find ${TEST_PATH} -name '*.ino' -exec dirname {} \;)
include $(top_dir)/etc/makefiles/arduino-cli.mk
# If we start off in tests to run make all, the sketch makefiles guess the wrong location for # If we start off in tests to run make all, the sketch makefiles guess the wrong location for
# Kaliedoscope's makefiles # Kaliedoscope's makefiles
@ -54,7 +55,7 @@ googletest: ${top_dir}/testing/googletest/build/Makefile
${top_dir}/testing/googletest/build/Makefile: ${top_dir}/testing/googletest/build/Makefile:
$(info googletest Makefile is being remade) $(info googletest Makefile is being remade)
install -d ${top_dir}/testing/googletest/build && cd ${top_dir}/testing/googletest/build && cmake .. install -d ${top_dir}/testing/googletest/build && cd ${top_dir}/testing/googletest/build && cmake -DCMAKE_C_COMPILER=$(call _arduino_prop,compiler.path)$(call _arduino_prop,compiler.c.cmd) -DCMAKE_CXX_COMPILER=$(call _arduino_prop,compiler.path)$(call _arduino_prop,compiler.cpp.cmd) ..
${libcommon_a}: ${libcommon_a}:
${MAKE} -f ${top_dir}/testing/makefiles/libcommon.mk -C ${top_dir}/testing ${MAKE} -f ${top_dir}/testing/makefiles/libcommon.mk -C ${top_dir}/testing

Loading…
Cancel
Save