Commit f1b2a9d0 authored by Kyle Lutz's avatar Kyle Lutz Committed by Kitware Robot

Merge topic 'fix_nightly_binary_naming'

a4ae259e Add windows executable name and path
5c89c5a5 Add support for suffix customization
parents 6785dbc6 a4ae259e
# CMake script used to setup ParaView Nightly binary in order to test them
#
# The following variable need to be set by you:
# - PV_NIGHTLY_SUFFIX : Suffix that should be tested on that given computer.
# i.e.: glibc-2.3.6-NIGHTLY, glibc-2.15-NIGHTLY,
# 10.6-10.7-NIGHTLY, 10.8-NIGHTLY, 10.8-NoMPI-NIGHTLY
#
# The following variable will be set for you:
# - PV_NIGHTLY_PARAVIEW : ParaView executable
# - PV_NIGHTLY_PVPYTHON : pvpython executable
......@@ -21,12 +26,17 @@ set(PV_NIGHTLY_PVBLOT "")
set(PV_NIGHTLY_PVDATASERVER "")
set(PV_NIGHTLY_PVRENDERSERVER "")
# If PV_NIGHTLY_SUFFIX not set, then set it to the default NIGHTLY value
if(NOT PV_NIGHTLY_SUFFIX)
set(PV_NIGHTLY_SUFFIX "NIGHTLY")
endif()
# ---------------------------------
# Linux
# ---------------------------------
if(UNIX AND NOT APPLE)
set(paraview_nightly_server_filename "ParaView-${PV_NIGHTLY_VERSION}-Linux-${PARAVIEW_BUILD_ARCHITECTURE}bit-NIGHTLY.tar.gz")
set(paraview_nightly_server_filename "ParaView-${PV_NIGHTLY_VERSION}-Linux-${PARAVIEW_BUILD_ARCHITECTURE}bit-${PV_NIGHTLY_SUFFIX}.tar.gz")
ExternalProject_Add( Nightly-ParaView
URL "${SUPERBUILD_DOWNLOAD_BASE_URL}/${paraview_nightly_server_filename}"
SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/ParaViewNightly
......@@ -53,7 +63,7 @@ endif()
# ---------------------------------
if(APPLE)
set(paraview_nightly_server_filename "ParaView-${PV_NIGHTLY_VERSION}-Darwin-${PARAVIEW_BUILD_ARCHITECTURE}bit-NIGHTLY.dmg")
set(paraview_nightly_server_filename "ParaView-${PV_NIGHTLY_VERSION}-Darwin-${PARAVIEW_BUILD_ARCHITECTURE}bit-${PV_NIGHTLY_SUFFIX}.dmg")
set(paraview_nightly_filePath ${CMAKE_CURRENT_BINARY_DIR}/ParaViewNightly/PVNightly.dmg)
if(NOT EXISTS ${paraview_nightly_filePath})
......@@ -108,7 +118,7 @@ endif()
# ---------------------------------
if(WIN32 OR WIN64)
set(paraview_nightly_server_filename "ParaView-${PV_NIGHTLY_VERSION}-Windows-${PARAVIEW_BUILD_ARCHITECTURE}bit-NIGHTLY.zip")
set(paraview_nightly_server_filename "ParaView-${PV_NIGHTLY_VERSION}-Windows-${PARAVIEW_BUILD_ARCHITECTURE}bit-${PV_NIGHTLY_SUFFIX}.zip")
ExternalProject_Add( Nightly-ParaView
URL "${SUPERBUILD_DOWNLOAD_BASE_URL}/${paraview_nightly_server_filename}"
......@@ -120,13 +130,13 @@ if(WIN32 OR WIN64)
INSTALL_COMMAND ""
)
# Setup Unix specific path
set(PV_NIGHTLY_PARAVIEW "")
set(PV_NIGHTLY_PVPYTHON "")
set(PV_NIGHTLY_PVSERVER "")
set(PV_NIGHTLY_PVBATCH "")
set(PV_NIGHTLY_PVBLOT "")
set(PV_NIGHTLY_PVDATASERVER "")
set(PV_NIGHTLY_PVRENDERSERVER "")
# Setup Windows specific path
set(PV_NIGHTLY_PARAVIEW "${CMAKE_CURRENT_BINARY_DIR}/ParaViewNightly/bin/paraview.exe")
set(PV_NIGHTLY_PVPYTHON "${CMAKE_CURRENT_BINARY_DIR}/ParaViewNightly/bin/pvpython.exe")
set(PV_NIGHTLY_PVSERVER "${CMAKE_CURRENT_BINARY_DIR}/ParaViewNightly/bin/pvserver.exe")
set(PV_NIGHTLY_PVBATCH "${CMAKE_CURRENT_BINARY_DIR}/ParaViewNightly/bin/pvbatch.exe")
set(PV_NIGHTLY_PVBLOT "${CMAKE_CURRENT_BINARY_DIR}/ParaViewNightly/bin/pvblot.exe")
set(PV_NIGHTLY_PVDATASERVER "${CMAKE_CURRENT_BINARY_DIR}/ParaViewNightly/bin/pvdataserver.exe")
set(PV_NIGHTLY_PVRENDERSERVER "${CMAKE_CURRENT_BINARY_DIR}/ParaViewNightly/bin/pvrenderserver.exe")
endif()
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