Commit 1571163f authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot
Browse files

Merge topic 'matplotlib-3.2.1'

78927db6 paraview: fix python enable logic
8fdabf25 cmake: add pkgconf to the project list
0c687f53

 superbuild: bump for matplotlib 3.2.1
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !712
parents 267a6e84 78927db6
......@@ -108,6 +108,7 @@ function (superbuild_find_projects var)
lapack
libxml2
mili
pkgconf
rapidjson
scipy)
......
......@@ -88,8 +88,8 @@ endif ()
set(PARAVIEW_USE_PYTHON ${python_enabled})
if (python_enabled AND
((USE_SYSTEM_python2 AND NOT python2_FIND_LIBRARIES) OR
(USE_SYSTEM_python3 AND NOT python3_FIND_LIBRARIES)))
((python2_enabled AND USE_SYSTEM_python2 AND NOT python2_FIND_LIBRARIES) OR
(python3_enabled AND USE_SYSTEM_python3 AND NOT python3_FIND_LIBRARIES)))
set(PARAVIEW_USE_PYTHON OFF)
endif()
......
Subproject commit 9594e969fae840725db783ca4fe5328e409be1ff
Subproject commit 6a42e8a9f29049f704cf48fdb64a9049fbfd9ecb
Supports Markdown
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