Merge tag 'v6.2.0' into databrowser

VTK 6.2.0

Accelerators/Dax/vtkDaxConfig.h.in

@@ -12,8 +12,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#ifndef __vtkDaxConfig_h
-#define __vtkDaxConfig_h
+#ifndef vtkDaxConfig_h
+#define vtkDaxConfig_h
 
 // Boost gives a bunch of warnings with nvcc if you don't specify how shared
 // pointers should handle threads. Dax does not care (it is too careful about
@@ -38,4 +38,4 @@
 #include <dax/internal/Configure.h>
 
 #include <dax/cont/DeviceAdapter.h>
-#endif // __vtkDaxConfig_h
+#endif // vtkDaxConfig_h

Accelerators/Dax/vtkDaxContour.h

@@ -14,8 +14,8 @@
 //
 //=============================================================================
 
-#ifndef __vtkDaxContour_h
-#define __vtkDaxContour_h
+#ifndef vtkDaxContour_h
+#define vtkDaxContour_h
 
 #include "vtkContourFilter.h"
 #include "vtkAcceleratorsDaxModule.h" //required for correct implementation

Accelerators/Dax/vtkDaxContourImpl.h

@@ -14,8 +14,8 @@
 //
 //=============================================================================
 
-#ifndef __vtkDaxContourImpl_h
-#define __vtkDaxContourImpl_h
+#ifndef vtkDaxContourImpl_h
+#define vtkDaxContourImpl_h
 
 // Common code
 #include "vtkDaxConfig.h"

Accelerators/Dax/vtkDaxDetailCommon.h

@@ -14,8 +14,8 @@
 //
 //=============================================================================
 
-#ifndef __vtkDaxDetailCommon_h
-#define __vtkDaxDetailCommon_h
+#ifndef vtkDaxDetailCommon_h
+#define vtkDaxDetailCommon_h
 
 #include "vtkCellTypes.h"
 #include "vtkDataSet.h"

Accelerators/Dax/vtkDaxThreshold.h

@@ -14,8 +14,8 @@
 //
 //=============================================================================
 
-#ifndef __vtkDaxThreshold_h
-#define __vtkDaxThreshold_h
+#ifndef vtkDaxThreshold_h
+#define vtkDaxThreshold_h
 
 #include "vtkThreshold.h"
 #include "vtkAcceleratorsDaxModule.h" //required for correct implementation
@@ -41,4 +41,4 @@ private:
   void operator=(const vtkDaxThreshold&); // Not implemented
 };
 
-#endif // __vtkDaxThreshold_h
+#endif // vtkDaxThreshold_h

Accelerators/Dax/vtkDaxThresholdImpl.h

@@ -14,8 +14,8 @@
 //
 //=============================================================================
 
-#ifndef __vtkDaxThresholdImpl_h
-#define __vtkDaxThresholdImpl_h
+#ifndef vtkDaxThresholdImpl_h
+#define vtkDaxThresholdImpl_h
 
 // Common code
 #include "vtkDaxConfig.h"

Accelerators/Piston/vtkDataSetToPiston.h

@@ -21,8 +21,8 @@
 // .SECTION See Also
 // vtkPistonToDataSet
 
-#ifndef __vtkDataSetToPiston_h
-#define __vtkDataSetToPiston_h
+#ifndef vtkDataSetToPiston_h
+#define vtkDataSetToPiston_h
 
 #include "vtkPistonAlgorithm.h"
 

Accelerators/Piston/vtkPistonAlgorithm.h

@@ -30,8 +30,8 @@
 // class breaks out the downstream requests into separate functions such as
 // ExecuteData and ExecuteInformation.
 
-#ifndef __vtkPistonAlgorithm_h
-#define __vtkPistonAlgorithm_h
+#ifndef vtkPistonAlgorithm_h
+#define vtkPistonAlgorithm_h
 
 #include "vtkAcceleratorsPistonModule.h" // For export macro
 #include "vtkAlgorithm.h"

Accelerators/Piston/vtkPistonContour.h

@@ -16,8 +16,8 @@
 // .SECTION Description
 // This filter uses LANL's Piston library to isocontour on the GPU.
 
-#ifndef __vtkPistonContour_h
-#define __vtkPistonContour_h
+#ifndef vtkPistonContour_h
+#define vtkPistonContour_h
 
 #include "vtkPistonAlgorithm.h"
 

Accelerators/Piston/vtkPistonDataObject.h

@@ -25,8 +25,8 @@
 // .SECTION See Also
 // vtkPistonReference
 
-#ifndef __vtkPistonDataObject_h
-#define __vtkPistonDataObject_h
+#ifndef vtkPistonDataObject_h
+#define vtkPistonDataObject_h
 
 #include "vtkAcceleratorsPistonModule.h" // For export macro
 #include "vtkDataObject.h"

Accelerators/Piston/vtkPistonDataWrangling.h

@@ -18,8 +18,8 @@
 // The vtk_polydata struct is important as that is how piston's polygonal
 // results get brought back to the CPU.
 
-#ifndef __vtkPistonDataWrangling_h
-#define __vtkPistonDataWrangling_h
+#ifndef vtkPistonDataWrangling_h
+#define vtkPistonDataWrangling_h
 
 #include <thrust/version.h>
 #if THRUST_VERSION >= 100600
@@ -67,5 +67,5 @@ struct float4tofloat3 : thrust::unary_function<float4, float3>
 
 } //namespace
 
-#endif //__vtkPistonDataWrangling_h
+#endif //vtkPistonDataWrangling_h
 // VTK-HeaderTest-Exclude: vtkPistonDataWrangling.h

Accelerators/Piston/vtkPistonMapper.h

@@ -18,8 +18,8 @@
 // The important capability it has is to produce images without bringing
 // data back to the CPU.
 
-#ifndef __vtkPistonMapper_h
-#define __vtkPistonMapper_h
+#ifndef vtkPistonMapper_h
+#define vtkPistonMapper_h
 
 #include "vtkAcceleratorsPistonModule.h" // For export macro
 #include "vtkMapper.h"
@@ -89,6 +89,8 @@ public:
   // Bring this algorithm's outputs up-to-date.
   // Overridden to allow specification on streaming piece.
   virtual void Update();
+  // Use the other overloads of Update.
+  using vtkAlgorithm::Update;
 
   // Description:
   // If you want only a part of the data, specify by setting the piece.

Accelerators/Piston/vtkPistonMinMax.h

@@ -17,8 +17,8 @@
 // Used in vtkPistonMapper to determine data range as part of color mapping
 // process.
 
-#ifndef __vtkPistonMinMax_h
-#define __vtkPistonMinMax_h
+#ifndef vtkPistonMinMax_h
+#define vtkPistonMinMax_h
 
 #include <thrust/device_vector.h>
 #include <thrust/host_vector.h>
@@ -93,5 +93,5 @@ namespace vtkPiston
   }
 }
 
-#endif // __vtkPistonMinMax_h
+#endif // vtkPistonMinMax_h
 // VTK-HeaderTest-Exclude: vtkPistonMinMax.h

Accelerators/Piston/vtkPistonScalarsColors.h

@@ -18,8 +18,8 @@
 // vtkPistonMapper uses this class to interface vtkScalarsToColors to GPU
 // side code that implements color mapping.
 
-#ifndef __vtkPistonScalarsColors_h
-#define __vtkPistonScalarsColors_h
+#ifndef vtkPistonScalarsColors_h
+#define vtkPistonScalarsColors_h
 
 #include "vtkAcceleratorsPistonModule.h" // For export macro
 #include "vtkObject.h"
@@ -101,4 +101,4 @@ private:
   void operator=(const vtkPistonScalarsColors&);  // Not implemented.
 };
 
-#endif // __vtkPistonScalarsColors_h
+#endif // vtkPistonScalarsColors_h

Accelerators/Piston/vtkPistonSlice.h

@@ -16,8 +16,8 @@
 // .SECTION Description
 // This filter uses LANL's Piston library to slice on the GPU.
 
-#ifndef __vtkPistonSlice_h
-#define __vtkPistonSlice_h
+#ifndef vtkPistonSlice_h
+#define vtkPistonSlice_h
 
 #include "vtkPistonAlgorithm.h"
 

Accelerators/Piston/vtkPistonSort.h

@@ -20,8 +20,8 @@
 // keeps the same data type while producing a result which is verifiably
 // correct.
 
-#ifndef __vtkPistonSort_h
-#define __vtkPistonSort_h
+#ifndef vtkPistonSort_h
+#define vtkPistonSort_h
 
 #include "vtkPistonAlgorithm.h"
 

Accelerators/Piston/vtkPistonThreshold.h

@@ -16,8 +16,8 @@
 // .SECTION Description
 // This filter uses LANL's Piston library to isocontour on the GPU.
 
-#ifndef __vtkPistonThreshold_h
-#define __vtkPistonThreshold_h
+#ifndef vtkPistonThreshold_h
+#define vtkPistonThreshold_h
 
 #include "vtkPistonAlgorithm.h"
 

Accelerators/Piston/vtkPistonToDataSet.h

@@ -21,8 +21,8 @@
 // .SECTION See Also
 // vtkDataSetToPiston
 
-#ifndef __vtkPistonToDataSet_h
-#define __vtkPistonToDataSet_h
+#ifndef vtkPistonToDataSet_h
+#define vtkPistonToDataSet_h
 
 #include "vtkPistonAlgorithm.h"
 

CMake/FindMPI.cmake

@@ -136,7 +136,7 @@ set(_MPI_XL_Fortran_COMPILER_NAMES         mpixlf95   mpixlf95_r mpxlf95 mpxlf95
 # or if we know it matches the regular compiler.
 foreach (lang C CXX Fortran)
   foreach (id GNU Intel PGI XL)
-    if (NOT CMAKE_${lang}_COMPILER_ID OR "${CMAKE_${lang}_COMPILER_ID}" STREQUAL "${id}")
+    if (NOT CMAKE_${lang}_COMPILER_ID OR CMAKE_${lang}_COMPILER_ID} STREQUAL id)
       list(APPEND _MPI_${lang}_COMPILER_NAMES ${_MPI_${id}_${lang}_COMPILER_NAMES})
     endif()
     unset(_MPI_${id}_${lang}_COMPILER_NAMES)    # clean up the namespace here
@@ -150,6 +150,13 @@ set(_MPI_EXEC_NAMES                        mpiexec mpirun lamexec srun)
 # Grab the path to MPI from the registry if we're on windows.
 set(_MPI_PREFIX_PATH)
 if(WIN32)
+  # MSMPI
+  file(TO_CMAKE_PATH "$ENV{MSMPI_BIN}" msmpi_bin_path) # The default path ends with a '\' and doesn't mix with ';' when appending.
+  list(APPEND _MPI_PREFIX_PATH "${msmpi_bin_path}")
+  unset(msmpi_bin_path)
+  list(APPEND _MPI_PREFIX_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\MPI;InstallRoot]/Bin")
+  list(APPEND _MPI_PREFIX_PATH "$ENV{MSMPI_INC}/..") # The SDK is installed separately from the runtime
+  # MPICH
   list(APPEND _MPI_PREFIX_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MPICH\\SMPD;binary]/..")
   list(APPEND _MPI_PREFIX_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MPICH2;Path]")
   list(APPEND _MPI_PREFIX_PATH "$ENV{ProgramW6432}/MPICH2/")
@@ -404,16 +411,18 @@ function (interrogate_mpi_compiler lang try_libs)
 
       # Decide between 32-bit and 64-bit libraries for Microsoft's MPI
       if("${CMAKE_SIZEOF_VOID_P}" EQUAL 8)
-        set(MS_MPI_ARCH_DIR amd64)
+        set(MS_MPI_ARCH_DIR x64)
+        set(MS_MPI_ARCH_DIR2 amd64)
       else()
-        set(MS_MPI_ARCH_DIR i386)
+        set(MS_MPI_ARCH_DIR x86)
+        set(MS_MPI_ARCH_DIR2 i386)
       endif()
 
       set(MPI_LIB "MPI_LIB-NOTFOUND" CACHE FILEPATH "Cleared" FORCE)
       find_library(MPI_LIB
         NAMES         mpi mpich mpich2 msmpi
         HINTS         ${_MPI_BASE_DIR} ${_MPI_PREFIX_PATH}
-        PATH_SUFFIXES lib lib/${MS_MPI_ARCH_DIR} Lib Lib/${MS_MPI_ARCH_DIR})
+        PATH_SUFFIXES lib lib/${MS_MPI_ARCH_DIR} Lib Lib/${MS_MPI_ARCH_DIR} Lib/${MS_MPI_ARCH_DIR2})
       set(MPI_LIBRARIES_WORK ${MPI_LIB})
 
       # Right now, we only know about the extra libs for C++.

CMake/MakeFramework.cmake.in

-file(GLOB INSTALLED_VTK_LIBS
-    "@CMAKE_INSTALL_PREFIX@/lib/libvtk*.a")
-set(FRAMEWORK_PATH
-    "@CMAKE_FRAMEWORK_INSTALL_PREFIX@/vtk.framework")
-set(INSTALLED_HEADERS
-    "@CMAKE_INSTALL_PREFIX@/@VTK_INSTALL_INCLUDE_DIR@")
+#
+# Before calling this, ensure that the following variables are set:
+#
+# VTK_DEVICE_LIBS - a path containing a wildcard suitable for globbing
+# VTK_SIMULATOR_LIBS - a path containing a wildcard suitable for globbing
+# VTK_INSTALLED_HEADERS - the path containing all headers for the framework
+# CMAKE_FRAMEWORK_INSTALL_PREFIX - the path in which to make vtk.framework
+#
 
 # Make sure VTK is installed.
-if (NOT EXISTS ${INSTALLED_HEADERS})
+if (NOT EXISTS "@VTK_INSTALLED_HEADERS@")
   message(FATAL_ERROR
           "VTK not installed. Build the source then build the 'install' target.")
 endif()
 
+# Ensure a framework path is set
+if (NOT EXISTS "@CMAKE_FRAMEWORK_INSTALL_PREFIX@")
+  message(FATAL_ERROR
+          "Please specifiy a CMAKE_FRAMEWORK_INSTALL_PREFIX.")
+endif()
+
+# Glob all input libs
+file(GLOB VTK_LIB_GLOB
+  "@VTK_DEVICE_LIBS@"
+  "@VTK_SIMULATOR_LIBS@"
+)
+
+# Set framework output path
+set(FRAMEWORK_PATH "@CMAKE_FRAMEWORK_INSTALL_PREFIX@/vtk.framework")
+
 # Do these individually, as we don't want them piped
 execute_process(COMMAND mkdir -p "${FRAMEWORK_PATH}")
 execute_process(COMMAND mkdir -p "${FRAMEWORK_PATH}/Headers")
-execute_process(COMMAND cp -r "${INSTALLED_HEADERS}/"
+execute_process(COMMAND cp -r "@VTK_INSTALLED_HEADERS@/"
                               "${FRAMEWORK_PATH}/Headers/.")
 execute_process(COMMAND libtool -static -o
-                      "${FRAMEWORK_PATH}/lib_device"
-                      ${INSTALLED_VTK_LIBS})
-execute_process(COMMAND lipo -create "${FRAMEWORK_PATH}/lib_device"
+                      "${FRAMEWORK_PATH}/vtk_lib"
+                      ${VTK_LIB_GLOB})
+execute_process(COMMAND lipo -create "${FRAMEWORK_PATH}/vtk_lib"
                              -output "${FRAMEWORK_PATH}/vtk")
-execute_process(COMMAND rm "${FRAMEWORK_PATH}/lib_device")
+execute_process(COMMAND rm "${FRAMEWORK_PATH}/vtk_lib")
 
-message(STATUS "Created ${FRAMEWORK_PATH}")
+message(STATUS "Created ${FRAMEWORK_PATH}")
\ No newline at end of file