Add configure flag for excluding libprofiler

This commit is contained in:
Max Brunsfeld 2015-02-16 17:57:53 -08:00
parent 074a7884aa
commit 7a71d91fb6
3 changed files with 17 additions and 6 deletions

View file

@ -3,5 +3,5 @@ compiler:
- gcc
before_install:
- sudo apt-get install libboost-regex1.48-dev
install: script/configure.sh -D USE_BOOST_REGEX
install: script/configure.sh -D USE_BOOST_REGEX=true -D USE_LIBPROFILER=false
script: script/test_all.sh

View file

@ -11,10 +11,14 @@ if [ "$1" == "-h" ]; then
Variables:
-D USE_BOOST_REGEX - Use boost regex library for tests, not the built-in regex
library. This is useful when linking against an older
version of the standard library. libboost_regex must be
installed.
-D USE_BOOST_REGEX=true
Use boost regex library for tests, not the built-in regex library. This is
useful when linking against an older version of the standard library.
libboost_regex must be installed.
-D USE_LIBPROFILER=false
Don't link libprofiler into the test binaries. This flag is needed on systems
where libprofiler (from the google-perftools package) is not installed.
HELP
fi

View file

@ -65,7 +65,14 @@
'-std=c++0x',
],
'libraries': ['-weak-lprofiler'],
'variables': {
'USE_LIBPROFILER%': 'true',
},
'conditions': [
['USE_LIBPROFILER != "false"', {
'libraries': ['-lprofiler'],
}]
],
'xcode_settings': {
'CLANG_CXX_LANGUAGE_STANDARD': 'c++11',