travis script updates

.travis.yml

@@ -1,5 +1,8 @@
 language: cpp
 
+cache:
+  - ccache: true
+
 os:
   - linux
   - osx
@@ -19,12 +22,12 @@ addons:
     sources:
       - ubuntu-toolchain-r-test
       - george-edison55-precise-backports
-      - llvm-toolchain-trusty-5.0
+      - llvm-toolchain-trusty-7
     packages:
       - cmake
       - cmake-data
       - g++-7
-      - clang-5.0
+      - clang-7
 
 matrix:
     exclude:
@@ -49,14 +52,16 @@ before_install:
     - git submodule update --init 
 
 install:
-  - if [[ "$CXX" == "g++" ]]; then export CC="gcc-7"  ;fi
-  - if [[ "$CXX" == "g++" ]]; then export CXX="g++-7" ;fi
+  - if [[ "$CXX" == "g++" ]];     then export CC="gcc-7"      ;fi
+  - if [[ "$CXX" == "g++" ]];     then export CXX="g++-7"     ;fi
+  - if [[ "$CXX" == "clang++" && "${TRAVIS_OS_NAME}" != "osx" ]]; then export CC="clang-7"    ;fi
+  - if [[ "$CXX" == "clang++" && "${TRAVIS_OS_NAME}" != "osx" ]]; then export CXX="clang++-7" ;fi
 
 # Universal Setup
 before_script:
   - mkdir build_$EA_CONFIG
   - cd build_$EA_CONFIG
-  - cmake .. -DEABASE_BUILD_TESTS:BOOL=ON
+  - cmake .. -DEAMAIN_BUILD_TESTS:BOOL=ON
   - cmake --build . --config $EA_CONFIG
 
 script: