Merge remote-tracking branch 'refs/remotes/origin/master' into solve-complex-system

Author: dcwhite

.travis.yml

@@ -16,12 +16,12 @@ matrix:
 before_install:
 - date -u
 - uname -a
-- sudo apt-get install mesa-common-dev libgl1-mesa-dev mesa-utils-extra libglapi-mesa ninja-build
+- sudo apt-get install mesa-common-dev libgl1-mesa-dev mesa-utils-extra libglapi-mesa ninja-build libqt4-dev qt4-qmake libqt4-opengl-dev
 
 script:
   - cd bin
   - cmake -GNinja -DTRAVIS_BUILD:BOOL=ON ../Superbuild
-  - travis_wait 40 ninja
+  - travis_wait 80 ninja
   - cd SCIRun
   - ./Algorithm_Layer_Test
   - ./Modules_Factory_Tests --gtest_filter=*HardCodedModuleFactoryTests*

Superbuild/Superbuild.cmake

@@ -93,10 +93,14 @@ OPTION(TRAVIS_BUILD "Slim build for Travis CI" OFF)
 MARK_AS_ADVANCED(TRAVIS_BUILD)
 
 IF(TRAVIS_BUILD)
-  SET(BUILD_TESTING OFF)
-  SET(DOWNLOAD_TOOLKITS OFF)
-  SET(BUILD_HEADLESS ON)
-  SET(BUILD_WITH_PYTHON OFF)
+  IF(CMAKE_C_COMPILER_ID MATCHES "GNU")
+    SET(BUILD_TESTING OFF)
+    SET(DOWNLOAD_TOOLKITS OFF)
+    SET(BUILD_HEADLESS ON)
+    SET(BUILD_WITH_PYTHON OFF)
+  ELSE()
+    # try building everything with clang!
+  ENDIF()
   ADD_DEFINITIONS(-DTRAVIS_BUILD)
 ENDIF()