From a60dbc167ac0dc4295823d104e679fe6a06ebf1c Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 29 Mar 2020 18:01:46 +0800 Subject: [PATCH] Update macro --- trunk/auto/utest.sh | 2 +- trunk/configure | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/trunk/auto/utest.sh b/trunk/auto/utest.sh index 27bfe0693..e7ce6a4a1 100755 --- a/trunk/auto/utest.sh +++ b/trunk/auto/utest.sh @@ -49,7 +49,7 @@ USER_DIR = . CPPFLAGS += -I\$(GTEST_DIR)/include # Flags passed to the C++ compiler. -CXXFLAGS += ${CXXFLAGS} -Wextra ${EXTRA_DEFINES} +CXXFLAGS += ${CXXFLAGS} -Wextra ${UTEST_EXTRA_DEFINES} # All tests produced by this Makefile. Remember to add new tests you # created to the list. diff --git a/trunk/configure b/trunk/configure index b3a4cb47f..fa927a2d9 100755 --- a/trunk/configure +++ b/trunk/configure @@ -396,7 +396,7 @@ fi # For utest on mac. # @see https://github.com/protocolbuffers/protobuf/issues/51#issuecomment-111044468 if [[ $SRS_OSX == YES ]]; then - EXTRA_DEFINES="-DGTEST_USE_OWN_TR1_TUPLE=1" + UTEST_EXTRA_DEFINES="-DGTEST_USE_OWN_TR1_TUPLE=1" fi # # utest, the unit-test cases of srs, base on gtest1.6