Sascha Zelzer 10 роки тому
батько
коміт
ccf8a0f085
3 змінених файлів з 18 додано та 5 видалено
  1. 8 1
      .travis.yml
  2. 10 3
      CMake/ctkTravisDashboardScript.cmake
  3. 0 1
      CMakeExternals/DCMTK.cmake

+ 8 - 1
.travis.yml

@@ -7,11 +7,18 @@ branches:
   only:
     - travis-ci-2
 
-env: DISPLAY=:9 # LD_LIBRARY_PATH=${HOME}/build/commontk/CTK-Superbuild-Release-experimental/CMakeExternals/Install/lib
+env:
+  global:
+    - DISPLAY=:9
+  matrix:
+    - CTK_QT_VERSION=5
+    - CTK_QT_VERSION=4
 
 before_install:
+  - 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
+  - sudo apt-get install -y libqt5webkit5-dev qttools5-dev-tools libsqlite3-dev
   - sudo apt-get install -y xpra xserver-xorg-video-dummy
 
 before_script:

+ 10 - 3
CMake/ctkTravisDashboardScript.cmake

@@ -13,17 +13,23 @@ cmake_minimum_required(VERSION 2.8)
 # For additional information, see http://www.commontk.org/index.php/Dashboard_setup
 #
 
+set(CTK_QT_VERSION $ENV{CTK_QT_VERSION})
+if(NOT CTK_QT_VERSION)
+  set(CTK_QT_VERSION 4)
+endif()
+
 #
 # Dashboard properties
 #
 set(MY_OPERATING_SYSTEM "Ubuntu-12.04")
 set(MY_COMPILER "g++4.6.3")
-set(MY_QT_VERSION "4.8.1")
-set(QT_QMAKE_EXECUTABLE "/usr/bin/qmake")
 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)
+set(MY_QT_VERSION ${QT${CTK_QT_VERSION}_VERSION})
+
 #
 # Dashboard options
 #
@@ -55,11 +61,12 @@ set(SCRIPT_MODE "experimental") # "experimental", "continuous", "nightly"
 set(CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}/CTK")
 set(CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}/CTK-Superbuild-${CTEST_BUILD_CONFIGURATION}-${SCRIPT_MODE}")
 
-# Additionnal CMakeCache options - For example:
+# Additional CMakeCache options - For example:
 # CTK_LIB_Widgets:BOOL=ON
 # CTK_APP_ctkDICOM:BOOL=ON
 
 set(ADDITIONNAL_CMAKECACHE_OPTION "
+CTK_QT_VERSION:STRING=${CTK_QT_VERSION}
 CTK_BUILD_ALL:BOOL=ON
 CTK_BUILD_EXAMPLES:BOOL=ON
 CTK_USE_SYSTEM_VTK:BOOL=ON

+ 0 - 1
CMakeExternals/DCMTK.cmake

@@ -60,7 +60,6 @@ if(NOT DEFINED DCMTK_DIR AND NOT ${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj})
       ${ep_common_cache_args}
       ${ep_project_include_arg}
       -DBUILD_SHARED_LIBS:BOOL=ON
-      -DCMAKE_INSTALL_RPATH:STRING=${ep_install_dir}/lib
       -DDCMTK_WITH_DOXYGEN:BOOL=OFF
       -DDCMTK_WITH_ZLIB:BOOL=OFF # see github issue #25
       -DDCMTK_WITH_OPENSSL:BOOL=OFF # see github issue #25