Merge pull request #992 from UV-CDAT/update_references_for_master

Updated packages reference

Author: doutriaux1

CMake/cdat_modules/paraview_external.cmake

@@ -153,7 +153,7 @@ if(CDAT_BUILD_OFFSCREEN)
 endif()
 
 include(GetGitRevisionDescription)
-set(paraview_branch ${PARAVIEW_MD5})
+set(paraview_branch ${PARAVIEW_BRANCH})
 
 get_git_head_revision(refspec sha)
 #if("${refspec}" STREQUAL "refs/heads/devel-master")

CMake/cdat_modules/paraview_pkg.cmake

@@ -4,7 +4,8 @@ set(PARAVIEW_PATCH 0)
 set(PARAVIEW_VERSION ${PARAVIEW_MAJOR}.${PARAVIEW_MINOR}.${PARAVIEW_PATCH})
 set(PARAVIEW_URL ${LLNL_URL})
 set(PARAVIEW_GZ ParaView-${PARAVIEW_VERSION}c.tar.gz)
-set(PARAVIEW_MD5 uvcdat-2.1.0)
+set(PARAVIEW_MD5)
+set(PARAVIEW_BRANCH uvcdat-master)
 set(PARAVIEW_SOURCE ${GIT_PROTOCOL}github.com/UV-CDAT/ParaView.git )
 
 add_cdat_package_dependent(ParaView "" "" ON "CDAT_BUILD_GRAPHICS" OFF)

CMake/cdat_modules/uvcmetrics_pkg.cmake

@@ -1,5 +1,3 @@
-set(UVCMETRICS_TAG 790a22a00d57e2ddaeffbb79b869df169a626204)
-
 set (nm UVCMETRICS)
 string(TOUPPER ${nm} uc_nm)
 set(${uc_nm}_VERSION ${${nm}_TAG})
@@ -8,8 +6,7 @@ set(UVCMETRICS_ZIP uvcmetrics-${UVCMETRICS_VERSION}.zip)
 #set(UVCMETRICS_SOURCE ${UVCMETRICS_URL}/${UVCMETRICS_ZIP})
 set(UVCMETRICS_SOURCE ${GIT_PROTOCOL}github.com/UV-CDAT/uvcmetrics.git )
 set(UVCMETRICS_MD5)
-set(UVCMETRICS_BRANCH uvcdat-2.1.0)
-#set(GIT_TAG 1808453d1cac69e54761521a3e1519b099f34c35)
+set(UVCMETRICS_BRANCH master)
 
 add_cdat_package(UVCMETRICS "" "" ON)
 

CMake/cdat_modules/vistrails_external.cmake

@@ -2,7 +2,7 @@
 # and configure and build it
 
 include(GetGitRevisionDescription)
-set(vistrails_branch ${VISTRAILS_MD5})
+set(vistrails_branch ${VISTRAILS_BRANCH})
 
 get_git_head_revision(refspec sha)
 
@@ -19,9 +19,9 @@ if (NOT _branch STREQUAL "${refspec}")
         if (_url)
             if(_url MATCHES "^.*uvcdat.git")
               if(_branch STREQUAL "master")
-                set(vistrails_branch ${VISTRAILS_MD5})
+                set(vistrails_branch ${VISTRAILS_BRANCH})
               elseif(_branch STREQUAL "release")
-                set(vistrails_branch ${VISTRAILS_MD5})
+                set(vistrails_branch ${VISTRAILS_BRANCH})
               endif()
             elseif(_url MATCHES "^.*uvcdat-devel.git")
               set(vistrails_branch uvcdat-next)

CMake/cdat_modules/vistrails_pkg.cmake

@@ -1,6 +1,6 @@
 set(VISTRAILS_VERSION ${VISTRAILS_TAG_POINT})
 set(VISTRAILS_SOURCE "${GIT_PROTOCOL}github.com/UV-CDAT/VisTrails.git")
 set(VISTRAILS_VERSION uvcdat-2.1.0)
-## Now tarball so faking md5 to tell checkout point
-set(VISTRAILS_MD5 uvcdat-master)
+set(VISTRAILS_MD5)
+set(VISTRAILS_BRANCH uvcdat-master)
 add_cdat_package_dependent(vistrails "" "" ON "CDAT_BUILD_GUI" OFF)

CMake/cdat_modules/vtk_external.cmake

@@ -90,7 +90,7 @@ ExternalProject_Add(VTK
   BINARY_DIR ${vtk_binary}
   INSTALL_DIR ${vtk_install}
   ${GIT_CMD_STR}
-  GIT_TAG ${VTK_MD5}
+  GIT_TAG ${VTK_BRANCH}
   UPDATE_COMMAND ""
   PATCH_COMMAND ""
   CMAKE_CACHE_ARGS

CMake/cdat_modules/vtk_pkg.cmake

@@ -1,5 +1,4 @@
 set(VTK_SOURCE ${GIT_PROTOCOL}github.com/UV-CDAT/VTK.git )
-set(VTK_MD5 uvcdat-2.1.0)
-
-
+set(VTK_MD5)
+set(VTK_BRANCH uvcdat-master)
 add_cdat_package_dependent(VTK "" "" ON "CDAT_BUILD_GRAPHICS" OFF)

CMakeLists.txt

@@ -623,7 +623,12 @@ foreach(package ${external_packages})
 
   if(CDAT_BUILD_${uc_package})
       message("[INFO] Package --- ${package}/${uc_package}/${${uc_package}_VERSION} --- will be built")
-    list(APPEND packages_info "${package} ${${uc_package}_VERSION} ${${uc_package}_SOURCE} ${${uc_package}_MD5}\n")
+    list(APPEND packages_info "${package} ${${uc_package}_VERSION} ${${uc_package}_SOURCE} ")
+    if (${uc_package}_MD5)
+      list(APPEND packages_info "${${uc_package}_MD5}\n")
+    else()
+      list(APPEND packages_info "${${uc_package}_BRANCH}\n")
+    endif()
     include("${lc_package}_external")
   endif()
 endforeach()