diff --git a/.travis.yml b/.travis.yml
index 36f4f7b..5b91675 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,6 @@
 # https://travis-ci.org
 
 dist: trusty
-sudo: false
 language: cpp
 
 matrix:
@@ -13,10 +12,27 @@ matrix:
           sources:
           - ubuntu-toolchain-r-test
           packages:
-          - gcc-5
-          - g++-5
-      env: GCC_VERSION=5
-      compiler: gcc-5
+          - g++-6
+          - ninja-build
+          - xorg-dev 
+          - libglu1-mesa-dev
+      env: 
+        - MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"
+      compiler: g++-6
+
+    - os: linux
+      addons:
+        apt:
+          sources:
+          - ubuntu-toolchain-r-test
+          packages:
+          - g++-7
+          - ninja-build
+          - xorg-dev 
+          - libglu1-mesa-dev
+      env: 
+        - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
+      compiler: g++-7
 
     - os: linux
       addons:
@@ -24,27 +40,100 @@ matrix:
           sources:
             - ubuntu-toolchain-r-test
           packages:
-            - gcc-8
             - g++-8
-      env: GCC_VERSION=8
-      compiler: gcc-8
+            - ninja-build
+            - xorg-dev 
+            - libglu1-mesa-dev
+      env:
+        - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8"
+      compiler: g++-8
 
-install:
-  - if [[ "${GCC_VERSION}" != "" ]]; then export CXX="g++-${GCC_VERSION}"; export CC="gcc-${GCC_VERSION}"; fi
+    - os: linux
+      before_install:
+        - sudo apt-get update
+        - sudo apt-get purge g++
+        - sudo apt-get install g++-6
+        - sudo apt-get install clang-3.6
+        - CC=clang-3.6 && CXX=clang++-3.6
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-3.6
+          packages:
+            - ninja-build
+            - xorg-dev 
+            - libglu1-mesa-dev
+      env:
+        - MATRIX_EVAL=""
+      compiler: clang++-3.6
+
+    - os: linux
+      before_install:
+        - sudo apt-get update
+        - sudo apt-get purge g++
+        - sudo apt-get install g++-6
+        - sudo apt-get install clang-4.0
+        - CC=clang-4.0 && CXX=clang++-4.0
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-4.0
+          packages:
+            - ninja-build
+            - xorg-dev 
+            - libglu1-mesa-dev
+      env:
+        - MATRIX_EVAL=""
+      compiler: clang++-4.0
+
+    - os: linux
+      before_install:
+        - sudo apt-get update
+        - sudo apt-get purge g++
+        - sudo apt-get install g++-6
+        - sudo apt-get install clang-5.0
+        - CC=clang-5.0 && CXX=clang++-5.0
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-5.0
+          packages:
+            - ninja-build
+            - xorg-dev 
+            - libglu1-mesa-dev
+      env:
+        - MATRIX_EVAL=""
+      compiler: clang++-5.0
+
+    - os: linux
+      before_install:
+        - sudo apt-get update
+        - sudo apt-get purge g++
+        - sudo apt-get install g++-6
+        - sudo apt-get install clang-6.0
+        - CC=clang-6.0 && CXX=clang++-6.0
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-6.0
+          packages:
+            - ninja-build
+            - xorg-dev 
+            - libglu1-mesa-dev
+      env:
+        - MATRIX_EVAL=""
+      compiler: clang++-6.0
+
+before_install:
+  - eval "${MATRIX_EVAL}"
 
 script:
+  - mkdir build
+  - cd build
   - cmake --version
-  - cmake -H. -B/tmp/build
-  - make -C /tmp/build
-  - /tmp/build/VulkanHppGenerator
-  - echo "#include \"vulkan.hpp\"" > /tmp/test.cpp
-  - echo "int myCreateInstance()" >> /tmp/test.cpp
-  - echo "{" >> /tmp/test.cpp
-  - echo "    vk::Instance inst;" >> /tmp/test.cpp
-  - echo "    auto const inst_info = vk::InstanceCreateInfo();" >> /tmp/test.cpp
-  - echo "    vk::Result result = vk::createInstance(&inst_info, nullptr, &inst);" >> /tmp/test.cpp
-  - echo "    return static_cast<int> (result);" >> /tmp/test.cpp
-  - echo "}" >> /tmp/test.cpp
-  - cat /tmp/test.cpp
-  - ${CXX} -std=c++11 -Wall -Ivulkan -IVulkan-Headers/include -c /tmp/test.cpp
-  - ${CXX} -std=c++14 -Wall -Ivulkan -IVulkan-Headers/include -c /tmp/test.cpp
+  - cmake -GNinja .. -DSAMPLES_BUILD=ON -DTESTS_BUILD=ON -DSAMPLES_BUILD_ONLY_DYNAMIC=ON -DSAMPLES_BUILD_WITH_LOCAL_VULKAN_HPP=ON -DTESTS_BUILD_ONLY_DYNAMIC=ON -DTESTS_BUILD_WITH_LOCAL_VULKAN_HPP=ON
+  - cmake --build .
\ No newline at end of file