diff --git a/CMake/PackageDepends/MITK_QVTK_Config.cmake b/CMake/PackageDepends/MITK_QVTK_Config.cmake index 560c8a1624..ede2480b59 100644 --- a/CMake/PackageDepends/MITK_QVTK_Config.cmake +++ b/CMake/PackageDepends/MITK_QVTK_Config.cmake @@ -1,3 +1,3 @@ include(${MITK_MODULES_PACKAGE_DEPENDS_DIR}/MITK_VTK_Config.cmake) -list(APPEND ALL_LIBRARIES QVTK) +#list(APPEND ALL_LIBRARIES QVTK) diff --git a/CMake/PackageDepends/MITK_VTK_Config.cmake b/CMake/PackageDepends/MITK_VTK_Config.cmake index 0efb56641e..606992b82e 100644 --- a/CMake/PackageDepends/MITK_VTK_Config.cmake +++ b/CMake/PackageDepends/MITK_VTK_Config.cmake @@ -1,135 +1,136 @@ if(NOT MITK_VTK_Config_INCLUDED) set(MITK_VTK_Config_INCLUDED 1) find_package(VTK REQUIRED) if(VTK_FOUND AND NOT VTK_BUILD_SHARED_LIBS) message(FATAL_ERROR "MITK only supports a VTK which was built with shared libraries. Turn on BUILD_SHARED_LIBS in your VTK config.") endif() include(${VTK_USE_FILE}) list(APPEND ALL_INCLUDE_DIRECTORIES ${VTK_INCLUDE_DIRS}) list(APPEND ALL_LIBRARY_DIRS ${VTK_LIBRARY_DIRS}) if(VTK_FOR_MITK_LIBRARIES) list(APPEND ALL_LIBRARIES ${VTK_FOR_MITK_LIBRARIES}) else() # Libraries in mitk/Utilities may depend on VTK but # the VTK_FOR_MITK_LIBRARIES variable is not yet set. # Supply the VTK libraries manually ## VTK6_TODO Remove unneeded Libraries list(APPEND ALL_LIBRARIES vtkalglib vtkChartsCore vtkCommonColor vtkCommonComputationalGeometry vtkCommonCore vtkCommonDataModel vtkCommonExecutionModel vtkCommonMath vtkCommonMisc vtkCommonSystem vtkCommonTransforms vtkDICOMParser vtkDomainsChemistry vtkexoIIc vtkexpat vtkFiltersAMR vtkFiltersCore vtkFiltersExtraction vtkFiltersFlowPaths vtkFiltersGeneral vtkFiltersGeneric vtkFiltersGeometry vtkFiltersHybrid vtkFiltersHyperTree vtkFiltersImaging vtkFiltersModeling vtkFiltersParallel vtkFiltersParallelImaging vtkFiltersProgrammable vtkFiltersSelection vtkFiltersSources vtkFiltersStatistics vtkFiltersTexture vtkFiltersVerdict vtkfreetype vtkftgl vtkGeovisCore vtkgl2ps vtkhdf5 vtkhdf5_hl vtkImagingColor vtkImagingCore vtkImagingFourier vtkImagingGeneral vtkImagingHybrid vtkImagingMath vtkImagingMorphological vtkImagingSources vtkImagingStatistics vtkImagingStencil vtkInfovisCore vtkInfovisLayout vtkInteractionImage vtkInteractionStyle vtkInteractionWidgets vtkIOAMR vtkIOCore vtkIOEnSight vtkIOExodus vtkIOExport vtkIOGeometry vtkIOImage vtkIOImport vtkIOInfovis vtkIOLegacy vtkIOLSDyna vtkIOMINC vtkIOMovie vtkIONetCDF vtkIOParallel vtkIOPLY vtkIOSQL vtkIOVideo vtkIOXML vtkIOXMLParser vtkjpeg vtkjsoncpp vtklibxml2 vtkmetaio vtkNetCDF vtkNetCDF_cxx vtkoggtheora vtkParallelCore vtkpng vtkproj4 vtkRenderingAnnotation vtkRenderingContext2D vtkRenderingCore vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkRenderingGL2PS vtkRenderingHybridOpenGL vtkRenderingImage vtkRenderingLabel vtkRenderingLOD vtkRenderingOpenGL vtkRenderingVolume vtkRenderingVolumeAMR vtkRenderingVolumeOpenGL vtksqlite vtksys vtkTestingRendering vtktiff vtkViewsContext2D vtkViewsCore vtkViewsGeovis vtkViewsInfovis vtkzlib + vtkGUISupportQt ${VTK_JPEG_LIBRARIES} ${VTK_PNG_LIBRARIES} ${VTK_ZLIB_LIBRARIES} ${VTK_EXPAT_LIBRARIES} ${VTK_FREETYPE_LIBRARIES} ) endif() endif(NOT MITK_VTK_Config_INCLUDED) diff --git a/CMakeExternals/VTK.cmake b/CMakeExternals/VTK.cmake index 951accc966..2ef92acc8a 100644 --- a/CMakeExternals/VTK.cmake +++ b/CMakeExternals/VTK.cmake @@ -1,99 +1,95 @@ #----------------------------------------------------------------------------- # VTK #----------------------------------------------------------------------------- if(WIN32) option(VTK_USE_SYSTEM_FREETYPE OFF) else(WIN32) option(VTK_USE_SYSTEM_FREETYPE ON) endif(WIN32) # Sanity checks if(DEFINED VTK_DIR AND NOT EXISTS ${VTK_DIR}) message(FATAL_ERROR "VTK_DIR variable is defined but corresponds to non-existing directory") endif() set(proj VTK) set(proj_DEPENDENCIES ) set(VTK_DEPENDS ${proj}) if(NOT DEFINED VTK_DIR) set(additional_cmake_args ) if(MINGW) set(additional_cmake_args -DCMAKE_USE_WIN32_THREADS:BOOL=ON -DCMAKE_USE_PTHREADS:BOOL=OFF -DVTK_USE_VIDEO4WINDOWS:BOOL=OFF # no header files provided by MinGW ) endif() if(MITK_USE_Python) list(APPEND additional_cmake_args -DVTK_WRAP_PYTHON:BOOL=ON -DVTK_USE_TK:BOOL=OFF -DVTK_WINDOWS_PYTHON_DEBUGGABLE:BOOL=OFF -DPYTHON_EXECUTABLE:FILEPATH=${PYTHON_EXECUTABLE} -DPYTHON_INCLUDE_DIR:PATH=${PYTHON_INCLUDE_DIR} -DPYTHON_INCLUDE_DIR2:PATH=${PYTHON_INCLUDE_DIR2} -DPYTHON_LIBRARY:FILEPATH=${PYTHON_LIBRARY} #-DPYTHON_LIBRARIES=${PYTHON_LIBRARY} #-DPYTHON_DEBUG_LIBRARIES=${PYTHON_DEBUG_LIBRARIES} ) else() list(APPEND additional_cmake_args -DVTK_WRAP_PYTHON:BOOL=OFF -DVTK_WINDOWS_PYTHON_DEBUGGABLE:BOOL=OFF ) endif() if(MITK_USE_QT) list(APPEND additional_cmake_args -DDESIRED_QT_VERSION:STRING=4 -DVTK_USE_GUISUPPORT:BOOL=ON -DVTK_USE_QVTK_QTOPENGL:BOOL=OFF -DVTK_USE_QT:BOOL=ON -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE} ) endif() set(VTK_URL /home/christoph/dev/bugsquashing/vtk-6.0.0.tar.gz) set(VTK_URL_MD5 72ede4812c90bdc55172702f0cad02bb) set(VTK_PATCH_COMMAND ${CMAKE_COMMAND} -DTEMPLATE_FILE:FILEPATH=${MITK_SOURCE_DIR}/CMakeExternals/EmptyFileForPatching.dummy -DWIN32_OPENGL_RW_FILE:FILEPATH=${MITK_SOURCE_DIR}/CMakeExternals/vtkWin32OpenGLRenderWindow.cxx.vtk-5.10.patched -P ${MITK_SOURCE_DIR}/CMakeExternals/PatchVTK-5.10.cmake) ExternalProject_Add(${proj} SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}-src BINARY_DIR ${proj}-build PREFIX ${proj}-cmake URL ${VTK_URL} URL_MD5 ${VTK_URL_MD5} INSTALL_COMMAND "" PATCH_COMMAND ${VTK_PATCH_COMMAND} CMAKE_GENERATOR ${gen} CMAKE_ARGS ${ep_common_args} + -DVTK_GROUP_QT:BOOL=ON -DVTK_WRAP_TCL:BOOL=OFF -DVTK_WRAP_PYTHON:BOOL=OFF -DVTK_WRAP_JAVA:BOOL=OFF -DBUILD_SHARED_LIBS:BOOL=ON - -DVTK_USE_PARALLEL:BOOL=ON - -DVTK_USE_CHARTS:BOOL=OFF - -DVTK_USE_QTCHARTS:BOOL=ON - -DVTK_USE_GEOVIS:BOOL=OFF -DVTK_USE_SYSTEM_FREETYPE:BOOL=${VTK_USE_SYSTEM_FREETYPE} - -DVTK_USE_QVTK_QTOPENGL:BOOL=OFF -DVTK_LEGACY_REMOVE:BOOL=ON -DModule_vtkTestingRendering:BOOL=ON -DModule_vtkGUISupportQt:BOOL=ON ${additional_cmake_args} DEPENDS ${proj_DEPENDENCIES} ) set(VTK_DIR ${CMAKE_CURRENT_BINARY_DIR}/${proj}-build) else() mitkMacroEmptyExternalProject(${proj} "${proj_DEPENDENCIES}") endif() diff --git a/Modules/Overlays/CMakeLists.txt b/Modules/Overlays/CMakeLists.txt index 9aba625a2c..51fb3c19b7 100644 --- a/Modules/Overlays/CMakeLists.txt +++ b/Modules/Overlays/CMakeLists.txt @@ -1,5 +1,5 @@ MITK_CREATE_MODULE( Overlays DEPENDS Qmitk - PACKAGE_DEPENDS QT QVTK + PACKAGE_DEPENDS QT QT_MODULE ) diff --git a/Modules/Qmitk/CMakeLists.txt b/Modules/Qmitk/CMakeLists.txt index c9ce24c0c0..8491386c40 100644 --- a/Modules/Qmitk/CMakeLists.txt +++ b/Modules/Qmitk/CMakeLists.txt @@ -1,9 +1,9 @@ MITK_CREATE_MODULE( Qmitk DEPENDS Mitk - PACKAGE_DEPENDS QT QVTK + PACKAGE_DEPENDS QT SUBPROJECTS MITK-CoreUI EXPORT_DEFINE QMITK_EXPORT QT_MODULE ) add_subdirectory(Testing)