Kaynağa Gözat

[Travis] Don't use system dcmtk

Sascha Zelzer 11 yıl önce
ebeveyn
işleme
2521a5318d
2 değiştirilmiş dosya ile 19 ekleme ve 19 silme
  1. 1 1
      .travis.yml
  2. 18 18
      CMake/ctkTravisDashboardScript.cmake

+ 1 - 1
.travis.yml

@@ -10,6 +10,6 @@ before_install:
   - sudo add-apt-repository ppa:kalakris/cmake -y
   - sudo apt-get update -qq
   - sudo apt-get install -y cmake
-  - sudo apt-get install -y libqt4-dev libqt4-sql-sqlite libdcmtk2-dev libinsighttoolkit3-dev libgdcm2-dev
+  - sudo apt-get install -y libqt4-dev libqt4-sql-sqlite
 
 script: ctest -VV -S ./CMake/ctkTravisDashboardScript.cmake

+ 18 - 18
CMake/ctkTravisDashboardScript.cmake

@@ -59,17 +59,17 @@ set(CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}/CTK-Superbuild-${CTEST_BUILD
 # CTK_APP_ctkDICOM:BOOL=ON
 
 set(ADDITIONNAL_CMAKECACHE_OPTION "
-CTK_USE_SYSTEM_DCMTK:BOOL=ON
+#CTK_USE_SYSTEM_DCMTK:BOOL=ON
 #CTK_USE_SYSTEM_ITK:BOOL=ON
-ITK_DIR:PATH=/usr/lib/InsightToolkit
+#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_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
@@ -81,24 +81,24 @@ 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_DICOM/Core:BOOL=ON
+#CTK_LIB_DICOM/Widgets:BOOL=ON
 
-CTK_LIB_ImageProcessing/ITK/Core: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_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.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.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