Skip to content

Commit 86ce221

Browse files
committed
Updated packages reference
For the uvcmetrics, I have followed what is suggested by Jeff and Brian.
1 parent e11b955 commit 86ce221

File tree

7 files changed

+12
-15
lines changed

7 files changed

+12
-15
lines changed

CMake/cdat_modules/paraview_external.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ if(CDAT_BUILD_OFFSCREEN)
153153
endif()
154154

155155
include(GetGitRevisionDescription)
156-
set(paraview_branch ${PARAVIEW_MD5})
156+
set(paraview_branch ${PARAVIEW_BRANCH})
157157

158158
get_git_head_revision(refspec sha)
159159
#if("${refspec}" STREQUAL "refs/heads/devel-master")

CMake/cdat_modules/paraview_pkg.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ set(PARAVIEW_PATCH 0)
44
set(PARAVIEW_VERSION ${PARAVIEW_MAJOR}.${PARAVIEW_MINOR}.${PARAVIEW_PATCH})
55
set(PARAVIEW_URL ${LLNL_URL})
66
set(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)
89
set(PARAVIEW_SOURCE ${GIT_PROTOCOL}github.com/UV-CDAT/ParaView.git )
910

1011
add_cdat_package_dependent(ParaView "" "" ON "CDAT_BUILD_GRAPHICS" OFF)
Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
set(UVCMETRICS_TAG 790a22a00d57e2ddaeffbb79b869df169a626204)
2-
31
set (nm UVCMETRICS)
42
string(TOUPPER ${nm} uc_nm)
53
set(${uc_nm}_VERSION ${${nm}_TAG})
@@ -8,8 +6,7 @@ set(UVCMETRICS_ZIP uvcmetrics-${UVCMETRICS_VERSION}.zip)
86
#set(UVCMETRICS_SOURCE ${UVCMETRICS_URL}/${UVCMETRICS_ZIP})
97
set(UVCMETRICS_SOURCE ${GIT_PROTOCOL}github.com/UV-CDAT/uvcmetrics.git )
108
set(UVCMETRICS_MD5)
11-
set(UVCMETRICS_BRANCH uvcdat-2.1.0)
12-
#set(GIT_TAG 1808453d1cac69e54761521a3e1519b099f34c35)
9+
set(UVCMETRICS_BRANCH master)
1310

1411
add_cdat_package_dependent(UVCMETRICS "" "" ON "CDAT_BUILD_GUI" OFF)
1512

CMake/cdat_modules/vistrails_external.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# and configure and build it
33

44
include(GetGitRevisionDescription)
5-
set(vistrails_branch ${VISTRAILS_MD5})
5+
set(vistrails_branch ${VISTRAILS_BRANCH})
66

77
get_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)
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
set(VISTRAILS_VERSION ${VISTRAILS_TAG_POINT})
22
set(VISTRAILS_SOURCE "${GIT_PROTOCOL}github.com/UV-CDAT/VisTrails.git")
33
set(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)
66
add_cdat_package_dependent(vistrails "" "" ON "CDAT_BUILD_GUI" OFF)

CMake/cdat_modules/vtk_external.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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

CMake/cdat_modules/vtk_pkg.cmake

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
set(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)
54
add_cdat_package_dependent(VTK "" "" ON "CDAT_BUILD_GRAPHICS" OFF)

0 commit comments

Comments
 (0)