From 417b13d6a11ec04efb452ef7aad6e527d14a8135 Mon Sep 17 00:00:00 2001 From: Giso Grimm Date: Fri, 22 Mar 2024 16:16:42 +0100 Subject: [PATCH] fix unit tests on MacOS --- rules.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rules.mk b/rules.mk index bea83d07..68eda71f 100644 --- a/rules.mk +++ b/rules.mk @@ -16,7 +16,7 @@ $(patsubst %,%-subdir-unit-tests,$(SUBDIRS)): $(MAKE) -C $(@:-subdir-unit-tests=) unit-tests execute-unit-tests: $(BUILD_DIR)/unit-test-runner - if [ -x $< ]; then LD_LIBRARY_PATH=./build:./libtascar/build $<; fi + pwd;if [ -x $< ]; then LD_LIBRARY_PATH=./build:../libtascar/build DYLD_LIBRARY_PATH=./build:../libtascar/build $<; fi unit_tests_test_files = $(wildcard $(SOURCE_DIR)/*_unit_tests.cc) @@ -28,13 +28,14 @@ ifeq ($(OS),Windows_NT) CXXFLAGS += -DISWINDOWS LIBTASCARDLL=../libtascar/$(BUILD_DIR)/libtascar.dll else - LIBTASCARDLL=../libtascar/$(BUILD_DIR)/libtascar.so UNAME_S := $(shell uname -s) ifeq ($(UNAME_S),Linux) + LIBTASCARDLL=../libtascar/$(BUILD_DIR)/libtascar.so CXXFLAGS += -DISLINUX BINFILES += tascar_hdspmixer endif ifeq ($(UNAME_S),Darwin) + LIBTASCARDLL=../libtascar/$(BUILD_DIR)/libtascar.dylib CXXFLAGS += -I/opt/homebrew/include -DISMACOS CPPFLAGS += -I/opt/homebrew/include LDFLAGS += -L/opt/homebrew/lib