diff --git a/CMakeExternals/PatchQwt-6.1.0.cmake b/CMakeExternals/PatchQwt-6.1.0.cmake new file mode 100644 index 0000000000..a1d4bee0c6 --- /dev/null +++ b/CMakeExternals/PatchQwt-6.1.0.cmake @@ -0,0 +1,11 @@ +set(path "src/qwt_transform.h") +file(STRINGS ${path} contents NEWLINE_CONSUME) +string(REPLACE "QT_STATIC_CONST" "static const" contents ${contents}) +set(CONTENTS ${contents}) +configure_file(${TEMPLATE_FILE} ${path} @ONLY) + +set(path "src/qwt_transform.cpp") +file(STRINGS ${path} contents NEWLINE_CONSUME) +string(REPLACE "QT_STATIC_CONST_IMPL" "const" contents ${contents}) +set(CONTENTS ${contents}) +configure_file(${TEMPLATE_FILE} ${path} @ONLY) diff --git a/CMakeExternals/Qwt.cmake b/CMakeExternals/Qwt.cmake index 83bf05ef75..2af4db7c02 100644 --- a/CMakeExternals/Qwt.cmake +++ b/CMakeExternals/Qwt.cmake @@ -1,43 +1,52 @@ #----------------------------------------------------------------------------- # 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) ExternalProject_Add(${proj} SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}-src BINARY_DIR ${proj}-build PREFIX ${proj}-cmake URL ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/qwt-6.1.0.tar.bz2 URL_MD5 aef0437b37f191067a6a9dc01c30ba64 PATCH_COMMAND ${patch_cmd} INSTALL_COMMAND "" CMAKE_GENERATOR ${gen} CMAKE_ARGS ${ep_common_args} ${qt_project_args} DEPENDS ${proj_DEPENDENCIES} ) + ExternalProject_Add_Step(${proj} qt54patch + COMMAND ${qt54patch_cmd} + WORKING_DIRECTORY ${proj}-src + DEPENDEES patch + DEPENDERS configure + LOG 1 + ) + set(${proj}_DIR ${CMAKE_CURRENT_BINARY_DIR}/${proj}-build) else() mitkMacroEmptyExternalProject(${proj} "${proj_DEPENDENCIES}") endif() endif()