diff --git a/CMakeExternals/Qwt-6.1.0.patch b/CMakeExternals/Qwt-6.1.0.patch deleted file mode 100644 index 51124e995c..0000000000 --- a/CMakeExternals/Qwt-6.1.0.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -urNb qwt-6.1.0/src/qwt_transform.cpp Qwt-src/src/qwt_transform.cpp ---- qwt-6.1.0/src/qwt_transform.cpp 2013-05-30 17:18:27.000000000 +0200 -+++ Qwt-src/src/qwt_transform.cpp 2015-01-13 20:39:27.533871912 +0100 -@@ -15,10 +15,10 @@ - #endif - - //! Smallest allowed value for logarithmic scales: 1.0e-150 --QT_STATIC_CONST_IMPL double QwtLogTransform::LogMin = 1.0e-150; -+const double QwtLogTransform::LogMin = 1.0e-150; - - //! Largest allowed value for logarithmic scales: 1.0e150 --QT_STATIC_CONST_IMPL double QwtLogTransform::LogMax = 1.0e150; -+const double QwtLogTransform::LogMax = 1.0e150; - - //! Constructor - QwtTransform::QwtTransform() -diff -urNb qwt-6.1.0/src/qwt_transform.h Qwt-src/src/qwt_transform.h ---- qwt-6.1.0/src/qwt_transform.h 2013-05-30 17:18:25.000000000 +0200 -+++ Qwt-src/src/qwt_transform.h 2015-01-13 20:39:27.533871912 +0100 -@@ -107,8 +107,8 @@ - - virtual QwtTransform *copy() const; - -- QT_STATIC_CONST double LogMin; -- QT_STATIC_CONST double LogMax; -+ static const double LogMin; -+ static const double LogMax; - }; - - /*! diff --git a/CMakeExternals/Qwt.cmake b/CMakeExternals/Qwt.cmake index b397f9e042..e14f51089a 100644 --- a/CMakeExternals/Qwt.cmake +++ b/CMakeExternals/Qwt.cmake @@ -1,62 +1,61 @@ #----------------------------------------------------------------------------- # Qwt #----------------------------------------------------------------------------- if(MITK_USE_Qwt) # Sanity checks if(DEFINED Qwt_DIR AND NOT EXISTS ${Qwt_DIR}) message(FATAL_ERROR "Qwt_DIR variable is defined but corresponds to non-existing directory") endif() set(proj Qwt) set(proj_DEPENDENCIES ) set(${proj}_DEPENDS ${proj}) if(NOT DEFINED ${proj}_DIR) set(patch_cmd ${CMAKE_COMMAND} -Dproj:STRING=${proj} -Dproj_target:STRING=qwt -P ${CMAKE_CURRENT_LIST_DIR}/GenerateDefaultCMakeBuildSystem.cmake) set(qt54patch_cmd ${CMAKE_COMMAND} -DTEMPLATE_FILE:FILEPATH=${MITK_SOURCE_DIR}/CMakeExternals/EmptyFileForPatching.dummy -P ${MITK_SOURCE_DIR}/CMakeExternals/PatchQwt-6.1.0.cmake) set(additional_cmake_args "-DQt5Svg_DIR:PATH=${Qt5Svg_DIR}" "-DQt5OpenGL_DIR:PATH=${Qt5OpenGL_DIR}" "-DQt5PrintSupport_DIR:PATH=${Qt5PrintSupport_DIR}" "-DQt5Concurrent_DIR:PATH=${Qt5Concurrent_DIR}" "-DQt5Designer_DIR:PATH=${Qt5_DIR}Designer" ) if(CTEST_USE_LAUNCHERS) list(APPEND additional_cmake_args "-DCMAKE_PROJECT_${proj}_INCLUDE:FILEPATH=${CMAKE_ROOT}/Modules/CTestUseLaunchers.cmake" ) endif() ExternalProject_Add(${proj} LIST_SEPARATOR ${sep} - URL ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/qwt-6.1.0.tar.bz2 - URL_MD5 aef0437b37f191067a6a9dc01c30ba64 - PATCH_COMMAND ${PATCH_COMMAND} -N -p1 -i ${CMAKE_CURRENT_LIST_DIR}/Qwt-6.1.0.patch - COMMAND ${CMAKE_COMMAND} -Dproj=${proj} -Dproj_target:STRING=qwt -P ${CMAKE_CURRENT_LIST_DIR}/GenerateDefaultCMakeBuildSystem.cmake + URL ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/qwt-6.1.5.tar.bz2 + URL_MD5 d65582f99312796ed42c3be3208ed3db + PATCH_COMMAND ${CMAKE_COMMAND} -Dproj=${proj} -Dproj_target:STRING=qwt -P ${CMAKE_CURRENT_LIST_DIR}/GenerateDefaultCMakeBuildSystem.cmake CMAKE_GENERATOR ${gen} CMAKE_GENERATOR_PLATFORM ${gen_platform} CMAKE_ARGS ${ep_common_args} ${additional_cmake_args} ${qt_project_args} CMAKE_CACHE_ARGS ${ep_common_cache_args} CMAKE_CACHE_DEFAULT_ARGS ${ep_common_cache_default_args} DEPENDS ${proj_DEPENDENCIES} ) set(${proj}_DIR ${ep_prefix}) mitkFunctionInstallExternalCMakeProject(${proj}) else() mitkMacroEmptyExternalProject(${proj} "${proj_DEPENDENCIES}") endif() endif()