summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorMark Nunberg <mnunberg@users.noreply.github.com>2019-02-21 13:05:58 -0500
committerGitHub <noreply@github.com>2019-02-21 13:05:58 -0500
commit297de989a647a6f96f25aabea267aa0d18c43328 (patch)
tree5afda44b01aea8a0b71ab7d01021cc2af9d91dd5 /.travis.yml
parent4d00404b8fb47e618474d5538e4a720ac1c95d95 (diff)
parentffceb87ec3aa8504aea933ee4584ff3bc540622f (diff)
Merge pull request #645 from redis/ssl
SSL Support
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml7
1 files changed, 4 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 4da8186..51171c0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,13 +28,14 @@ env:
- BITS="64"
script:
- - if [ "$TRAVIS_OS_NAME" == "osx" ]; then
+ - EXTRA_CMAKE_OPTS="-DENABLE_EXAMPLES:BOOL=ON -DHIREDIS_SSL:BOOL=ON";
+ if [ "$TRAVIS_OS_NAME" == "osx" ]; then
if [ "$BITS" == "32" ]; then
CFLAGS="-m32 -Werror";
CXXFLAGS="-m32 -Werror";
LDFLAGS="-m32";
+ EXTRA_CMAKE_OPTS=;
else
- EXTRA_CMAKE_OPTS="-DENABLE_EXAMPLES:BOOL=ON";
CFLAGS="-Werror";
CXXFLAGS="-Werror";
fi;
@@ -44,8 +45,8 @@ script:
CFLAGS="-m32 -Werror";
CXXFLAGS="-m32 -Werror";
LDFLAGS="-m32";
+ EXTRA_CMAKE_OPTS=;
else
- EXTRA_CMAKE_OPTS="-DENABLE_EXAMPLES:BOOL=ON";
CFLAGS="-Werror";
CXXFLAGS="-Werror";
fi;