Commit fb4f0280 authored by Haocheng LIU's avatar Haocheng LIU Committed by Kitware Robot

Merge topic 'fix-paraview-pixmap-size'

aed40044 Bump ParaView to absorb fix pixmap size patch for Qt 5.12.0
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: T.J. Corona's avatarT.J. Corona <tj.corona@kitware.com>
Merge-request: !510
parents 944b679b aed40044
Pipeline #140658 running with stage
......@@ -3,15 +3,20 @@ superbuild_set_revision(boost
URL_MD5 b2dfbd6c717be4a7bb2d88018eaccf75)
# XXX: When updating this, update the version number in CMakeLists.txt as well.
# The current version of ParaView is version 5.6.0.
set(paraview_revision "6cccdcfdf885a99009a72468fdfa29dbb696984b")
# The current version of ParaView is version 5.6.0 +
# commit c1693e068ac618ee16c28bf1ba3a0abfe3a48f90 which fixes the pixmap size for
# Qt 5.12.0.
# Now it points to a custom branch on Haocheng's gitlab.
#set(paraview_revision "6cccdcfdf885a99009a72468fdfa29dbb696984b")
if (USE_PARAVIEW_master)
set(paraview_revision origin/master)
endif ()
superbuild_set_revision(paraview
GIT_REPOSITORY "https://gitlab.kitware.com/paraview/paraview.git"
GIT_TAG "${paraview_revision}")
#GIT_REPOSITORY "https://gitlab.kitware.com/paraview/paraview.git"
#GIT_TAG "${paraview_revision}")
GIT_REPOSITORY "https://gitlab.kitware.com/haocheng.liu/paraview.git"
GIT_TAG "fix-icon-pixmap-size-based-5-6-0")
superbuild_set_revision(vtkonly
GIT_REPOSITORY "https://gitlab.kitware.com/vtk/vtk.git"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment