Просмотр исходного кода

Build all again, using the vtk-qt4-dev package.

Sascha Zelzer лет назад: 11
Родитель
Сommit
4c0795b065
2 измененных файлов с 3 добавлено и 50 удалено
  1. 1 1
      .travis.yml
  2. 2 49
      CMake/ctkTravisDashboardScript.cmake

+ 1 - 1
.travis.yml

@@ -11,7 +11,7 @@ env: DISPLAY=:9 LD_LIBRARY_PATH=${HOME}/build/commontk/CTK-Superbuild-Release-ex
 
 before_install:
   - sudo apt-get update -qq
-  - sudo apt-get install -y chrpath libqt4-dev qt4-dev-tools libvtk5-dev
+  - sudo apt-get install -y chrpath libqt4-dev qt4-dev-tools libvtk5-qt4-dev
   - sudo apt-get install -y xpra xserver-xorg-video-dummy
 
 before_script:

+ 2 - 49
CMake/ctkTravisDashboardScript.cmake

@@ -60,56 +60,9 @@ set(CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}/CTK-Superbuild-${CTEST_BUILD
 # CTK_APP_ctkDICOM:BOOL=ON
 
 set(ADDITIONNAL_CMAKECACHE_OPTION "
-#CTK_BUILD_ALL:BOOL=ON
-#CTK_BUILD_EXAMPLES:BOOL=ON
-
+CTK_BUILD_ALL:BOOL=ON
+CTK_BUILD_EXAMPLES:BOOL=ON
 CTK_USE_SYSTEM_VTK:BOOL=ON
-
-#CTK_USE_SYSTEM_DCMTK:BOOL=ON
-#CTK_USE_SYSTEM_ITK:BOOL=ON
-#ITK_DIR:PATH=/usr/lib/InsightToolkit
-
-#CTK_APP_ctkCommandLineModuleExplorer:BOOL=ON
-#CTK_APP_ctkDICOM:BOOL=ON
-#CTK_APP_ctkDICOM2:BOOL=ON
-#CTK_APP_ctkDICOMHost:BOOL=ON
-#CTK_APP_ctkDICOMIndexer:BOOL=ON
-#CTK_APP_ctkExampleHost:BOOL=ON
-#CTK_APP_ctkExampleHostedApp:BOOL=ON
-#CTK_APP_ctkPluginBrowser:BOOL=ON
-#CTK_APP_ctkPluginGenerator:BOOL=ON
-#CTK_APP_ctkXnatTreeBrowser:BOOL=ON
-
-#CTK_LIB_CommandLineModules/Backend/FunctionPointer:BOOL=ON
-#CTK_LIB_CommandLineModules/Backend/LocalProcess:BOOL=ON
-#CTK_LIB_CommandLineModules/Backend/XMLChecker:BOOL=ON
-#CTK_LIB_CommandLineModules/Core:BOOL=ON
-#CTK_LIB_CommandLineModules/Frontend/QtGui:BOOL=ON
-#CTK_LIB_CommandLineModules/Frontend/QtWebKit:BOOL=ON
-
-#CTK_LIB_DICOM/Core:BOOL=ON
-#CTK_LIB_DICOM/Widgets:BOOL=ON
-
-#CTK_LIB_ImageProcessing/ITK/Core:BOOL=ON
-#CTK_LIB_PluginFramework:BOOL=ON
-#CTK_LIB_Widgets:BOOL=ON
-#CTK_LIB_XNAT/Core:BOOL=ON
-#CTK_LIB_XNAT/Widgets:BOOL=ON
-
-CTK_LIB_Visualization/VTK/Widgets:BOOL=ON
-
-#CTK_PLUGIN_org.commontk.configadmin:BOOL=ON
-#CTK_PLUGIN_org.commontk.dah.cmdlinemoduleapp:BOOL=ON
-#CTK_PLUGIN_org.commontk.dah.core:BOOL=ON
-#CTK_PLUGIN_org.commontk.dah.exampleapp:BOOL=ON
-#CTK_PLUGIN_org.commontk.dah.examplehost:BOOL=ON
-#CTK_PLUGIN_org.commontk.dah.host:BOOL=ON
-#CTK_PLUGIN_org.commontk.dah.hostedapp:BOOL=ON
-#CTK_PLUGIN_org.commontk.eventadmin:BOOL=ON
-#CTK_PLUGIN_org.commontk.log:BOOL=ON
-#CTK_PLUGIN_org.commontk.metatype:BOOL=ON
-#CTK_PLUGIN_org.commontk.plugingenerator.core:BOOL=ON
-#CTK_PLUGIN_org.commontk.plugingenerator.ui:BOOL=ON
 ")
 
 # List of test that should be explicitly disabled on this machine