From 773d9814e73bd90fd35c7f2d9282265fe37ce956 Mon Sep 17 00:00:00 2001 From: "John M. Penn" Date: Tue, 4 Mar 2025 10:57:39 -0600 Subject: [PATCH] GTEST_HOME is /opt/homebrew only for Darwin,Arm. Everything else uses GTEST_HOME = /usr/local. --- trick_source/sim_services/DataTypes/testing/makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/trick_source/sim_services/DataTypes/testing/makefile b/trick_source/sim_services/DataTypes/testing/makefile index a7a3eb8b..c6ed1bb7 100644 --- a/trick_source/sim_services/DataTypes/testing/makefile +++ b/trick_source/sim_services/DataTypes/testing/makefile @@ -5,11 +5,13 @@ CPP = /usr/bin/g++ DECL_DIR = .. +GTEST_HOME=/usr/local UNAME_S = $(shell uname -s) +UNAME_M = $(shell uname -m) ifeq ($(UNAME_S),Darwin) - GTEST_HOME=/opt/homebrew -else - GTEST_HOME=/usr/local + ifeq ($(UNAME_M),arm64) + GTEST_HOME=/opt/homebrew + endif endif CFLAGS += -std=c++14 -g -Wall -Wextra -I$(GTEST_HOME)/include -I$(DECL_DIR)/include