Browse Source

[Travis] screw it, hard-code qt version.

Sascha Zelzer 10 years ago
parent
commit
c3907c7635
2 changed files with 4 additions and 10 deletions
  1. 0 4
      .travis.yml
  2. 4 6
      CMake/ctkTravisDashboardScript.cmake

+ 0 - 4
.travis.yml

@@ -11,13 +11,9 @@ env:
   global:
     - DISPLAY=:9
   matrix:
-    # - CTK_QT_VERSION=5
     - CTK_QT_VERSION=4
 
 before_install:
-  - which qmake
-  - qmake -version
-  - ls -l /usr/bin/qmake
   - sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa
   - sudo apt-get update -qq
   - sudo apt-get install -y chrpath libqt4-dev qt4-dev-tools libvtk5-qt4-dev

+ 4 - 6
CMake/ctkTravisDashboardScript.cmake

@@ -20,8 +20,11 @@ endif()
 
 if(CTK_QT_VERSION EQUAL "4")
   set(QT_QMAKE_EXECUTABLE "/usr/bin/qmake")
+  set(MY_QT_VERSION 4.8.1)
+else()
+  set(MY_QT_VERSION 5.x)
 endif()
-message("***** QT_QMAKE_EXECUTABLE: ${QT_QMAKE_EXECUTABLE}")
+
 #
 # Dashboard properties
 #
@@ -31,11 +34,6 @@ set(CTEST_SITE "travis-ci") # for example: mymachine.kitware, mymachine.dkfz, ..
 set(CTEST_DASHBOARD_ROOT "$ENV{HOME}/build/commontk")
 set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
 
-find_package(Qt${CTK_QT_VERSION} REQUIRED)
-if(NOT Qt${CTK_QT_VERSION}_FOUND)
-  message(SEND_ERROR "Qt${CTK_QT_VERSION} not found.")
-set(MY_QT_VERSION ${QTVERSION})
-
 #
 # Dashboard options
 #