mirror of
https://github.com/nasa/trick.git
synced 2025-04-18 16:17:43 +00:00
Merge pull request #1855 from nasa/DataTypesTestToC++14
Update testing build to use C++14 which is required for gtest.
This commit is contained in:
commit
d98eef4b66
@ -1,13 +1,20 @@
|
||||
|
||||
RM = rm -rf
|
||||
CC = cc
|
||||
CPP = c++
|
||||
CPP = /usr/bin/g++
|
||||
|
||||
DECL_DIR = ..
|
||||
|
||||
GTEST_HOME = /usr/local
|
||||
GTEST_HOME=/usr/local
|
||||
UNAME_S = $(shell uname -s)
|
||||
UNAME_M = $(shell uname -m)
|
||||
ifeq ($(UNAME_S),Darwin)
|
||||
ifeq ($(UNAME_M),arm64)
|
||||
GTEST_HOME=/opt/homebrew
|
||||
endif
|
||||
endif
|
||||
|
||||
CFLAGS += -g -Wall -Wextra -I$(GTEST_HOME)/include -I$(DECL_DIR)/include
|
||||
CFLAGS += -std=c++14 -g -Wall -Wextra -I$(GTEST_HOME)/include -I$(DECL_DIR)/include
|
||||
|
||||
LIBS = -L${DECL_DIR}/lib -lDecl -L${GTEST_HOME}/lib -lgtest -lgtest_main -lpthread
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user