Merge pull request #1321 from UV-CDAT/issue_1312_tag_repos

Issue 1312 tag repos

CMake/cdat_modules/paraview_pkg.cmake

@@ -5,7 +5,7 @@ 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)
-set(PARAVIEW_BRANCH uvcdat-master)
+set(PARAVIEW_BRANCH uvcdat-2.2.0)
 set(PARAVIEW_SOURCE ${GIT_PROTOCOL}github.com/UV-CDAT/ParaView.git )
 
 add_cdat_package_dependent(ParaView "" "" ON "CDAT_BUILD_GRAPHICS" OFF)

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)
+set(VISTRAILS_VERSION uvcdat-2.2.0)
 set(VISTRAILS_MD5)
-set(VISTRAILS_BRANCH uvcdat-master)
+set(VISTRAILS_BRANCH uvcdat-2.2.0)
 add_cdat_package_dependent(vistrails "" "" ON "CDAT_BUILD_GUI" OFF)

CMake/cdat_modules/vtk_pkg.cmake

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

CMake/cdat_modules_extra/checkout_testdata.cmake

@@ -28,7 +28,7 @@ if(NOT EXISTS "${TESTDATA_DIR}")
  # Use depth=1 to avoid fetching the full history. Use "git pull --unshallow"
  # to backfill the history if needed.
  execute_process(COMMAND
- "${GIT_EXECUTABLE}" clone --depth=1 "${TESTDATA_URL}" "${TESTDATA_DIR}"
+ "${GIT_EXECUTABLE}" clone -b ${TESTDATA_TAG} --depth=1 "${TESTDATA_URL}" "${TESTDATA_DIR}"
  RESULT_VARIABLE RESULT
  ERROR_VARIABLE OUTPUT
  OUTPUT_VARIABLE OUTPUT)

CMakeLists.txt

@@ -221,6 +221,7 @@ if(BUILD_TESTING)
  set(UVCDAT_GIT_TESTDATA_DIR "${CMAKE_BINARY_DIR}/uvcdat-testdata/"
  CACHE PATH "Directory to store supplemental testing data (Baselines, etc).")
  set(REPO_URL "")
+ set(REPO_TAG "uvcdat-2.2.0")
  if(GIT_PROTOCOL MATCHES "http://")
  set(REPO_URL "http://github.com/UV-CDAT/uvcdat-testdata.git")
  else()
@@ -230,6 +231,7 @@ if(BUILD_TESTING)
  add_custom_target(update-testdata ALL
  COMMAND "${CMAKE_COMMAND}"
  "-DGIT_EXECUTABLE=${GIT_EXECUTABLE}"
+ "-DTESTDATA_TAG=${REPO_TAG}"
  "-DTESTDATA_URL=${REPO_URL}"
  "-DTESTDATA_DIR=${UVCDAT_GIT_TESTDATA_DIR}"
  -P "${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/checkout_testdata.cmake"