File tree Expand file tree Collapse file tree 7 files changed +12
-15
lines changed
Expand file tree Collapse file tree 7 files changed +12
-15
lines changed Original file line number Diff line number Diff line change @@ -153,7 +153,7 @@ if(CDAT_BUILD_OFFSCREEN)
153153endif ()
154154
155155include (GetGitRevisionDescription)
156- set (paraview_branch ${PARAVIEW_MD5 } )
156+ set (paraview_branch ${PARAVIEW_BRANCH } )
157157
158158get_git_head_revision(refspec sha)
159159#if("${refspec}" STREQUAL "refs/heads/devel-master")
Original file line number Diff line number Diff line change @@ -4,7 +4,8 @@ set(PARAVIEW_PATCH 0)
44set (PARAVIEW_VERSION ${PARAVIEW_MAJOR} .${PARAVIEW_MINOR} .${PARAVIEW_PATCH} )
55set (PARAVIEW_URL ${LLNL_URL} )
66set (PARAVIEW_GZ ParaView-${PARAVIEW_VERSION} c.tar.gz)
7- set (PARAVIEW_MD5 uvcdat-2.1.0)
7+ set (PARAVIEW_MD5)
8+ set (PARAVIEW_BRANCH uvcdat-master)
89set (PARAVIEW_SOURCE ${GIT_PROTOCOL} github.com/UV-CDAT/ParaView.git )
910
1011add_cdat_package_dependent(ParaView "" "" ON "CDAT_BUILD_GRAPHICS" OFF )
Original file line number Diff line number Diff line change 1- set (UVCMETRICS_TAG 790a22a00d57e2ddaeffbb79b869df169a626204)
2-
31set (nm UVCMETRICS)
42string (TOUPPER ${nm} uc_nm)
53set (${uc_nm} _VERSION ${${nm} _TAG})
@@ -8,8 +6,7 @@ set(UVCMETRICS_ZIP uvcmetrics-${UVCMETRICS_VERSION}.zip)
86#set(UVCMETRICS_SOURCE ${UVCMETRICS_URL}/${UVCMETRICS_ZIP})
97set (UVCMETRICS_SOURCE ${GIT_PROTOCOL} github.com/UV-CDAT/uvcmetrics.git )
108set (UVCMETRICS_MD5)
11- set (UVCMETRICS_BRANCH uvcdat-2.1.0)
12- #set(GIT_TAG 1808453d1cac69e54761521a3e1519b099f34c35)
9+ set (UVCMETRICS_BRANCH master)
1310
1411add_cdat_package_dependent(UVCMETRICS "" "" ON "CDAT_BUILD_GUI" OFF )
1512
Original file line number Diff line number Diff line change 22# and configure and build it
33
44include (GetGitRevisionDescription)
5- set (vistrails_branch ${VISTRAILS_MD5 } )
5+ set (vistrails_branch ${VISTRAILS_BRANCH } )
66
77get_git_head_revision(refspec sha)
88
@@ -19,9 +19,9 @@ if (NOT _branch STREQUAL "${refspec}")
1919 if (_url)
2020 if (_url MATCHES "^.*uvcdat.git" )
2121 if (_branch STREQUAL "master" )
22- set (vistrails_branch ${VISTRAILS_MD5 } )
22+ set (vistrails_branch ${VISTRAILS_BRANCH } )
2323 elseif (_branch STREQUAL "release" )
24- set (vistrails_branch ${VISTRAILS_MD5 } )
24+ set (vistrails_branch ${VISTRAILS_BRANCH } )
2525 endif ()
2626 elseif (_url MATCHES "^.*uvcdat-devel.git" )
2727 set (vistrails_branch uvcdat-next)
Original file line number Diff line number Diff line change 11set (VISTRAILS_VERSION ${VISTRAILS_TAG_POINT} )
22set (VISTRAILS_SOURCE "${GIT_PROTOCOL} github.com/UV-CDAT/VisTrails.git" )
33set (VISTRAILS_VERSION uvcdat-2.1.0)
4- ## Now tarball so faking md5 to tell checkout point
5- set (VISTRAILS_MD5 uvcdat-master)
4+ set (VISTRAILS_MD5)
5+ set (VISTRAILS_BRANCH uvcdat-master)
66add_cdat_package_dependent(vistrails "" "" ON "CDAT_BUILD_GUI" OFF )
Original file line number Diff line number Diff line change @@ -84,7 +84,7 @@ ExternalProject_Add(VTK
8484 BINARY_DIR ${vtk_binary}
8585 INSTALL_DIR ${vtk_install}
8686 ${GIT_CMD_STR}
87- GIT_TAG ${VTK_MD5 }
87+ GIT_TAG ${VTK_BRANCH }
8888 UPDATE_COMMAND ""
8989 PATCH_COMMAND ""
9090 CMAKE_CACHE_ARGS
Original file line number Diff line number Diff line change 11set (VTK_SOURCE ${GIT_PROTOCOL} github.com/UV-CDAT/VTK.git )
2- set (VTK_MD5 uvcdat-2.1.0)
3-
4-
2+ set (VTK_MD5)
3+ set (VTK_BRANCH uvcdat-master)
54add_cdat_package_dependent(VTK "" "" ON "CDAT_BUILD_GRAPHICS" OFF )
You can’t perform that action at this time.
0 commit comments