Merge topic 'improve-and-fix-vtk-remote-modules'

0eb714a4 Remote.WikiExamples: Fix configuration using vtkExternalModuleMacros
33533740 vtkUtilitiesBenchmarks: Fix configuration by exporting module info
cf43c617 vtkMy/README: Remove obsolete reference to CVS
5fc6c045 vtkModuleTop/vtkModuleMacros: Fix typo in comment and ivar names
655f4351 Examples: Remove unneeded setting of CMP0020 policy to NEW

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3465

CMake/vtkModuleMacros.cmake

@@ -1030,7 +1030,7 @@ macro(vtk_add_module src f bld ) # [test-langs]
   unset(vtk-module-test)
 endmacro()
 
-# called internally to add all the modules undeneath a particular directory to the list of modules
+# called internally to add all the modules underneath a particular directory to the list of modules
 macro(vtk_module_glob src bld) # [test-langs]
   file(GLOB meta RELATIVE "${src}" "${src}/*/*/module.cmake")
   foreach(f ${meta})

CMake/vtkModuleTop.cmake

@@ -176,24 +176,24 @@ endforeach()
 if (NOT VTK_BUILD_ALL_MODULES_FOR_TESTS)
   # If VTK_BUILD_ALL_MODULES_FOR_TESTS is OFF, it implies that we didn't add any
   # test modules to the dependecy graph. We now add the test modules for all
-  # enabled modules iff the all the test dependecies are already satisfied
+  # enabled modules if all the test dependencies are already satisfied
   # (BUG #13297).
   foreach(vtk-module IN LISTS VTK_MODULES_ENABLED)
     foreach(test IN LISTS ${vtk-module}_TESTED_BY)
       # if all test-dependencies are satisfied, enable it.
-      set (missing_dependencis)
+      set (missing_dependencies)
       foreach(test-depends IN LISTS ${test}_DEPENDS)
         list(FIND VTK_MODULES_ENABLED ${test-depends} found)
         if (found EQUAL -1)
-          list(APPEND missing_dependencis ${test-depends})
+          list(APPEND missing_dependencies ${test-depends})
         endif()
       endforeach()
-      if (NOT missing_dependencis)
+      if (NOT missing_dependencies)
         vtk_module_enable(${test} "")
         list(APPEND VTK_MODULES_ENABLED ${test})
       else()
         message(STATUS
-        "Disable test module ${test} since required modules are not enabled: ${missing_dependencis}")
+        "Disable test module ${test} since required modules are not enabled: ${missing_dependencies}")
       endif()
     endforeach()
   endforeach()
@@ -297,7 +297,7 @@ foreach(vtk-module ${VTK_MODULES_ALL})
   endif()
 endforeach()
 
-#hide options of modules that are part of a different backend
+# Hide options of modules that are part of a different backend
 # or are required by the backend
 foreach(backend ${VTK_BACKENDS})
   foreach(module ${VTK_BACKEND_${backend}_MODULES})

Examples/Build/vtkMy/CMakeLists.txt

 cmake_minimum_required(VERSION 3.3 FATAL_ERROR)
-if(POLICY CMP0020)
-  cmake_policy(SET CMP0020 NEW)
-endif()
-
 
 #
 # Set the project name.

Examples/Build/vtkMy/README

@@ -25,9 +25,7 @@ on all other packages and will be linked against all VTK packages too.
 What you should do:
 -------------------
 
-- Copy this vtkMy directory to a different out-of-source place, and
-  remove all CVS subdirs to avoid any accidental commit to the main VTK
-  CVS.
+- Copy this vtkMy directory to a different out-of-source place.
 
 - Fill the subdirs with your own classes. Remove the dummy classes if
   needed. For each CMakeList.txt in the package dirs, add or remove the

Examples/CMakeLists.txt

 cmake_minimum_required(VERSION 3.3 FATAL_ERROR)
-if(POLICY CMP0020)
-  cmake_policy(SET CMP0020 NEW)
-endif()
-
 
 PROJECT(VTKExamples)
 include_regular_expression("^.*$")

Examples/Infovis/Cxx/CMakeLists.txt

 cmake_minimum_required(VERSION 3.3 FATAL_ERROR)
-if(POLICY CMP0020)
-  cmake_policy(SET CMP0020 NEW)
-endif()
 
 project(Infovis)
 

Remote/WikiExamples.remote.cmake

@@ -6,8 +6,8 @@
 
 # If the environement var WikiExamplesTag exists, use it
 if (NOT DEFINED ENV{WikiExamplesTag})
-  # October 9, 2017 New alternative baselines
-  set(GIT_TAG b73b03bc4bdd7d0053e0c2a5322a94a2bef937d8)
+  # October 21, 2017
+  set(GIT_TAG 3da258b63a92f34f41c01dbed0058435cd6371d5)
 else()
   set(GIT_TAG $ENV{WikiExamplesTag})
 endif()

Utilities/Benchmarks/CMakeLists.txt

 # Load up the CMake variables we need.
-vtk_module_impl()
+vtk_module_export_info()
 vtk_module_config(${vtk-module} ${${vtk-module}_DEPENDS})
 
 # Placeholders