Merge topic 'paraview-depend-on-netcdf'

1268177f paraview: fix paraview subdirectory
2947819a paraview: hard-depend on netcdf
7263a655 smtk: fix variable name
692c359a paraview: bump master forward
fcf928f2 smtk: netcdf/hdf5 via moab
067bb859 paraview: depend on netcdf as well
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: David Thompson <david.thompson@kitware.com>
Merge-request: !73

Projects/cmb.cmake

@@ -3,9 +3,9 @@ set(vtk_dir ${SuperBuild_BINARY_DIR}/paraview/src/paraview-build/VTK)
 set(smtk_dir ${SuperBuild_BINARY_DIR}/install/lib/cmake/SMTK)
 
 if (__BUILDBOT_INSTALL_LOCATION)
-  set(paraview_dir <INSTALL_DIR>/lib/cmake/paraview-4.3)
+  set(paraview_dir <INSTALL_DIR>/lib/cmake/paraview-4.4)
   set(smtk_dir <INSTALL_DIR>/lib/cmake/SMTK)
-  set(vtk_dir <INSTALL_DIR>/lib/cmake/paraview-4.3)
+  set(vtk_dir <INSTALL_DIR>/lib/cmake/paraview-4.4)
 endif ()
 
 set(CMB_TEST_DATA_ROOT "" CACHE PATH "Location of CMB's testing data")

Projects/moab.cmake

@@ -11,7 +11,7 @@ endif()
 #  set(cgm_find_flags "-DCGM_CFG:PATH=${SuperBuild_BINARY_DIR}/cgm/src/cgm/cgm.make")
 #endif()
 add_external_project(moab
-  DEPENDS hdf5 netcdfcpp
+  DEPENDS hdf5 netcdf netcdfcpp
 #  DEPENDS_OPTIONAL cgm
   CMAKE_ARGS
     -DBUILD_SHARED_LIBS:BOOL=OFF

Projects/paraview.cmake

@@ -68,8 +68,11 @@ add_external_project(paraview
     # Doesn't work for OpenGL2 yet
     # visitbridge
     zlib
+    netcdf
+    netcdfcpp
+    ${paraview_depends}
   DEPENDS_OPTIONAL
-    freetype ffmpeg hdf5 libxml3 manta mpi silo cgns mesa osmesa netcdfcpp
+    freetype ffmpeg hdf5 libxml3 manta mpi silo cgns mesa osmesa
   CMAKE_ARGS
     -DBUILD_SHARED_LIBS:BOOL=ON
     -DBUILD_TESTING:BOOL=OFF

Projects/smtk.cmake

 set(paraview_dir ${SuperBuild_BINARY_DIR}/paraview/src/paraview-build)
 
 if (__BUILDBOT_INSTALL_LOCATION)
-  set(paraview_dir <INSTALL_DIR>/lib/cmake/paraview-4.3)
+  set(paraview_dir <INSTALL_DIR>/lib/cmake/paraview-4.4)
 endif ()
 
 if (WIN32)
@@ -21,9 +21,8 @@ set(SMTK_PLUGIN_SUBDIR "${smtk_libdir}" CACHE INTERNAL "SMTK's plugin directory"
 set(SMTK_DATA_DIR "" CACHE PATH "Location of SMTK's testing data")
 
 add_external_project_or_just_build_dependencies(smtk
-  DEPENDS boost qt shiboken paraview remus
-          hdf5 netcdf
-  DEPENDS_OPTIONAL moab
+  DEPENDS boost qt shiboken paraview remus hdf5
+  DEPENDS_OPTIONAL moab netcdf netcdfcpp
   CMAKE_ARGS
     ${extra_cmake_args}
     "-C${CMAKE_BINARY_DIR}/env.cmake"

versions.cmake

@@ -110,9 +110,9 @@ if(USE_PARAVIEW_master)
     GIT_TAG master)
 else()
   add_revision(paraview
-    # updating to ParaView master of Oct 9, 2015
+    # updating to ParaView master of Oct 28, 2015
     GIT_REPOSITORY "https://gitlab.kitware.com/paraview/paraview.git"
-    GIT_TAG 30de2c9bc16fcd9532c3ad2105ac2467956d8d8b)
+    GIT_TAG feb4492a7ada0fcac7eee5c17f562d68dd89f387)
 endif()
 
 #------------------------------------------------------------------------------
@@ -170,7 +170,7 @@ add_revision(gdal
 option(SMTK_FROM_GIT "Build SMTK from git" ON)
 if (SMTK_FROM_GIT)
   set(smtk_tag "release-v1")
-  if (USE_PARAVIEW_master)
+  if (USE_SMTK_master)
     set(smtk_tag "master")
   endif ()