Commit c1c07f92 authored by Ben Boeckel's avatar Ben Boeckel
Browse files

wix: skip shipping MSMPI for now

parent a8c05e1a
......@@ -113,18 +113,19 @@ install(DIRECTORY "${install_location}/lib/paraview-${pv_version}"
COMPONENT ParaView
PATTERN "*.lib" EXCLUDE)
if (PARAVIEW_ENABLE_WIX AND mpi_ENABLED)
set(CPACK_WIX_PATCH_FILE "${CMAKE_CURRENT_LIST_DIR}/paraview.wix.patch.xml")
set(msmpi_path "${SuperBuild_BINARY_DIR}/msmpisdk.msi")
file(DOWNLOAD
"http://www.paraview.org/files/dependencies/msmpisdk.msi"
"${msmpi_path}"
EXPECTED_HASH MD5=5fa1742be2b478a5fd5e9361916e4e68)
install(
PROGRAMS "${msmpi_path}"
DESTINATION "tpl"
COMPONENT MSMPI)
endif ()
# FIXME: This is close, but not completely supported; nested MSI installers is forbidden on Windows.
#if (PARAVIEW_ENABLE_WIX AND mpi_ENABLED)
# set(CPACK_WIX_PATCH_FILE "${CMAKE_CURRENT_LIST_DIR}/paraview.wix.patch.xml")
# set(msmpi_path "${SuperBuild_BINARY_DIR}/msmpisdk.msi")
# file(DOWNLOAD
# "http://www.paraview.org/files/dependencies/msmpisdk.msi"
# "${msmpi_path}"
# EXPECTED_HASH MD5=5fa1742be2b478a5fd5e9361916e4e68)
# install(
# PROGRAMS "${msmpi_path}"
# DESTINATION "tpl"
# COMPONENT MSMPI)
#endif ()
# install system runtimes.
set(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION "bin")
......
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