Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2015-11-05 15:11:59 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
98e25def6c809a17bd2dfba7bc8924b668f5f59f
98e25def
1 parent
38b81ce3
fix utest build failed for osx.
隐藏空白字符变更
内嵌
并排对比
正在显示
1 个修改的文件
包含
10 行增加
和
1 行删除
trunk/auto/utest.sh
trunk/auto/utest.sh
查看文件 @
98e25de
...
...
@@ -20,6 +20,15 @@ SRS_TRUNK_PREFIX=../..
# gest dir, relative to objs/utest, it's trunk/objs/gtest
GTEST_DIR
=
${
SRS_TRUNK_PREFIX
}
/
${
SRS_OBJS_DIR
}
/gtest
# the extra defines to compile utest.
EXTRA_DEFINES
=
""
# for osx to disable the error.
# gtest/include/gtest/internal/gtest-port.h:499:13: fatal error: 'tr1/tuple' file not found
if
[
$SRS_OSX
=
YES
]
;
then
EXTRA_DEFINES
=
"
$EXTRA_DEFINES
-DGTEST_HAS_TR1_TUPLE=0"
fi
cat
<< END > ${FILE}
# user must run make the ${SRS_OBJS_DIR}/utest dir
# at the same dir of Makefile.
...
...
@@ -49,7 +58,7 @@ USER_DIR = .
CPPFLAGS += -I\$(GTEST_DIR)/include
# Flags passed to the C++ compiler.
CXXFLAGS += -g -Wall -Wextra -O0
CXXFLAGS += -g -Wall -Wextra -O0
${EXTRA_DEFINES}
# All tests produced by this Makefile. Remember to add new tests you
# created to the list.
...
...
请
注册
或
登录
后发表评论