Commit 2dfff4ee authored by Ben Boeckel's avatar Ben Boeckel

python: use a prebuilt python on Windows

parent bf2152cf
...@@ -57,6 +57,35 @@ install(FILES "${install_location}/bin/.plugins" ...@@ -57,6 +57,35 @@ install(FILES "${install_location}/bin/.plugins"
DESTINATION "bin" DESTINATION "bin"
COMPONENT superbuild) COMPONENT superbuild)
# install python since (since python dlls are not in the install location)
if (python_ENABLED AND NOT USE_SYSTEM_python)
# install the Python's modules.
install(DIRECTORY "${install_location}/bin/Lib"
DESTINATION "bin"
USE_SOURCE_PERMISSIONS
COMPONENT ParaView)
# install python dlls.
install(DIRECTORY "${install_location}/bin/"
DESTINATION "bin"
USE_SOURCE_PERMISSIONS
COMPONENT ParaView
FILES_MATCHING PATTERN "python*.dll")
# Move the png and zlib dlls into the installed matplotlib package so that it
# can find them at runtime.
install(DIRECTORY "${install_location}/bin/"
DESTINATION "bin/Lib/site-packages/matplotlib"
USE_SOURCE_PERMISSIONS
COMPONENT ParaView
FILES_MATCHING PATTERN "libpng*.dll")
install(DIRECTORY "${install_location}/bin/"
DESTINATION "bin/Lib/site-packages/matplotlib"
USE_SOURCE_PERMISSIONS
COMPONENT ParaView
FILES_MATCHING PATTERN "zlib*.dll")
endif()
if (shiboken_ENABLED) if (shiboken_ENABLED)
install(DIRECTORY "${install_location}/lib/site-packages/smtk" install(DIRECTORY "${install_location}/lib/site-packages/smtk"
DESTINATION "bin/Lib/site-packages" DESTINATION "bin/Lib/site-packages"
......
add_external_project(python
BUILD_IN_SOURCE 1
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND
"${CMAKE_COMMAND}"
"-Dinstall_dir:PATH=<INSTALL_DIR>"
-P "${CMAKE_CURRENT_LIST_DIR}/python.install.cmake")
foreach (dir bin include lib share)
file(GLOB files "${dir}/*")
file(INSTALL ${files}
DESTINATION "${install_dir}/${dir}")
endforeach ()
...@@ -92,6 +92,18 @@ add_revision(osmesa ...@@ -92,6 +92,18 @@ add_revision(osmesa
URL "http://paraview.org/files/dependencies/MesaLib-7.11.2.tar.gz" URL "http://paraview.org/files/dependencies/MesaLib-7.11.2.tar.gz"
URL_MD5 b9e84efee3931c0acbccd1bb5a860554) URL_MD5 b9e84efee3931c0acbccd1bb5a860554)
if (WIN32)
if (64bit_build)
add_revision(python
URL "http://www.paraview.org/files/dependencies/python+deps.tar.bz2"
URL_MD5 "4318b8f771eda5606d9ce7f0be9f82e1")
else ()
add_revision(python
URL "http://www.paraview.org/files/dependencies/python+deps-x32.tar.bz2"
URL_MD5 "6ba441784a672e08379d23ddd61146f0")
endif ()
endif()
if(USE_PARAVIEW_master) if(USE_PARAVIEW_master)
add_revision(paraview add_revision(paraview
GIT_REPOSITORY "https://gitlab.kitware.com/paraview/paraview.git" GIT_REPOSITORY "https://gitlab.kitware.com/paraview/paraview.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