diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2017-06-21 12:49:37 +0200 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2017-06-21 12:49:37 +0200 |
| commit | 65fd8fabe97906914a29b7fdbb078c469ff27aab (patch) | |
| tree | b99cfe8e8ca808e3a159d293d409326d7850d862 /.travis.yml | |
| parent | 282e10496516ddb6c5307e5ffb612a84083a6955 (diff) | |
| download | ATCD-65fd8fabe97906914a29b7fdbb078c469ff27aab.tar.gz | |
Only set ssl and xerces3 on linux
* .travis.yml:
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 37391fb9cdf..c20064d576b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -75,8 +75,9 @@ before_script: - if [ "$CCMNOEVENT" == "1" ]; then echo -e "ccm_noevent=1" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features; fi - if [ "$USES_WCHAR" == "1" ]; then echo -e "uses_wchar=1" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features; fi - if [ "$VERSIONED" == "1" ]; then echo -e "versioned_namespace=1" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features; fi - - echo -e "xerces3=1\nssl=1\nipv6=1\n" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU - - echo -e "xerces3=1\nssl=1\n" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features + - if [ "$TRAVIS_OS_NAME" == "linux" ]; then echo -e "xerces3=1\nssl=1\n" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU; fi + - echo -e "ipv6=1\n" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU + - if [ "$TRAVIS_OS_NAME" == "linux" ]; then echo -e "xerces3=1\nssl=1\n" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features; fi - echo -e "TAO/tests/Hello/run_test.pl" >> $TAO_ROOT/bin/travis-ci.lst - if [ "$CXX" == "g++" ]; then echo -e "c++11=1\n" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then echo -e "include \$(ACE_ROOT)/include/makeinclude/platform_macosx.GNU" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU; fi |