Commit c8ecfae1 authored by John Tourtellott's avatar John Tourtellott

Update to latest paraview/smtk versions and remove python workarounds

parent df47f9cc
Pipeline #157415 failed with stages
in 9 minutes and 51 seconds
......@@ -109,14 +109,3 @@ option(cmb_FETCH_LFS "Fetch LFS data for CMB" OFF)
if (cmb_enabled AND cmb_can_lfs AND cmb_FETCH_LFS)
cmb_superbuild_add_lfs_steps(cmb)
endif ()
if (WIN32)
# Workaround: configure a second time
# This step can be removed when VTK MR 6331 (created 20-Dec-2019) is merged.
superbuild_project_add_step(second-configure
COMMAND cmake <SOURCE_DIR>
COMMENT "Configuring a second time"
DEPENDEES configure
WORKING_DIRECTORY <BINARY_DIR>
)
endif()
......@@ -21,14 +21,3 @@ superbuild_add_project(smtkace3p
-DCMAKE_INSTALL_NAME_DIR:PATH=<INSTALL_DIR>/lib
-DSIMULATION_WORKFLOWS_ROOT:PATH=<INSTALL_DIR>/share/cmb/workflows
)
if (WIN32)
# Workaround: configure a second time
# This step can be removed when VTK MR 6331 (created 20-Dec-2019) is merged.
superbuild_project_add_step(second-configure
COMMAND cmake <SOURCE_DIR>
COMMENT "Configuring a second time"
DEPENDEES configure
WORKING_DIRECTORY <BINARY_DIR>
)
endif()
......@@ -19,14 +19,3 @@ superbuild_add_project(smtkprojectmanager
-DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
-DCMAKE_INSTALL_RPATH:STRING=${smtkprojectmanager_rpaths}
-DCMAKE_INSTALL_NAME_DIR:PATH=<INSTALL_DIR>/lib)
if (WIN32)
# Workaround: configure a second time
# This step can be removed when VTK MR 6331 (created 20-Dec-2019) is merged.
superbuild_project_add_step(second-configure
COMMAND cmake <SOURCE_DIR>
COMMENT "Configuring a second time"
DEPENDEES configure
WORKING_DIRECTORY <BINARY_DIR>
)
endif()
......@@ -22,7 +22,7 @@ set(boost_no_junction_patch_necessary TRUE)
superbuild_set_selectable_source(paraview
SELECT git CUSTOMIZABLE DEFAULT
GIT_REPOSITORY "https://gitlab.kitware.com/paraview/paraview.git"
GIT_TAG "f35a4cd2eb3436470562e965dfc9ca525d7f9c00"
GIT_TAG "dbfee3f64e9b64e126a2df217f0156381251aa3b"
SELECT for-v6.3.0 CUSTOMIZABLE
GIT_REPOSITORY "https://gitlab.kitware.com/cmb/paraview.git"
GIT_TAG "2c64f2e43b873a399aa2513a24d336470f2cc3b4"
......@@ -54,7 +54,7 @@ superbuild_set_selectable_source(smtk
GIT_SHALLOW "ON"
SELECT git CUSTOMIZABLE DEFAULT
GIT_REPOSITORY "https://gitlab.kitware.com/cmb/smtk.git"
GIT_TAG "f6a451db2881b2196ea38ca499a65e35c4b358af"
GIT_TAG "80dfc52f9b50d105b777ebcf968223996dcfdce3"
# GIT_TAG "origin/master"
# GIT_SHALLOW "${SUPERBUILD_SHALLOW_CLONES}"
SELECT source CUSTOMIZABLE
......
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