From 4bc5ecaa326277b88b5e1f57380629dc6c5ce50f Mon Sep 17 00:00:00 2001
From: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
Date: Sun, 22 Oct 2017 01:44:12 -0400
Subject: [PATCH] STYLE: Convert CMake-language commands to lower case

Ancient CMake versions required upper-case commands. Later
command names became case-insensitive. Now the preferred style
is lower-case


Former-commit-id: 1c448fb94be70406843f21a3f1392661053ccddd
---
 CMake/ExamplesTesting.cmake                   |  28 +-
 CMake/WikiOutputDirectories.cmake             |  16 +-
 CMake/vtkTestingObjectFactory.cmake           |   6 +-
 CMakeLists.txt                                | 120 +++---
 CTestConfig.cmake                             |   4 +-
 src/Admin/.idea/Admin.iml                     |  11 +
 src/Admin/.idea/codeStyleSettings.xml         |   9 +
 src/Admin/.idea/dictionaries/jcfr.xml         |   3 +
 src/Admin/.idea/encodings.xml                 |   6 +
 .../inspectionProfiles/Project_Default.xml    |   5 +
 .../inspectionProfiles/profiles_settings.xml  |   6 +
 src/Admin/.idea/misc.xml                      |  19 +
 src/Admin/.idea/modules.xml                   |   8 +
 src/Admin/.idea/workspace.xml                 | 374 ++++++++++++++++++
 src/Cxx/Animation/CMakeLists.txt              |  32 +-
 src/Cxx/CMakeTechniques/CheckForModule.cmake  |  10 +-
 src/Cxx/CompositeData/CMakeLists.txt          |  44 +--
 src/Cxx/DataStructures/CMakeLists.txt         |  56 +--
 .../ModifiedBSPTree/CMakeLists.txt            |  40 +-
 src/Cxx/DataStructures/Octree/CMakeLists.txt  |  38 +-
 src/Cxx/Databases/CMakeLists.txt              |   2 +-
 src/Cxx/Databases/SQL/MySQL/CMakeLists.txt    |  30 +-
 src/Cxx/Developers/CMakeLists.txt             |  52 +--
 src/Cxx/Filtering/CMakeLists.txt              |  46 +--
 src/Cxx/GeometricObjects/CMakeLists.txt       |  40 +-
 src/Cxx/Geovis/CMakeLists.txt                 |  36 +-
 src/Cxx/Graphs/CMakeLists.txt                 |  36 +-
 src/Cxx/HyperTreeGrid/CMakeLists.txt          |  34 +-
 src/Cxx/IO/CMakeLists.txt                     | 132 +++----
 src/Cxx/ImageData/CMakeLists.txt              |  40 +-
 src/Cxx/Images/CMakeLists.txt                 | 120 +++---
 src/Cxx/ImplicitFunctions/CMakeLists.txt      |  38 +-
 src/Cxx/InfoVis/CMakeLists.txt                |  50 +--
 src/Cxx/Interaction/CMakeLists.txt            |  44 +--
 src/Cxx/Lighting/CMakeLists.txt               |  30 +-
 src/Cxx/Math/CMakeLists.txt                   |  30 +-
 src/Cxx/Medical/CMakeLists.txt                |  52 +--
 src/Cxx/Meshes/CMakeLists.txt                 |  60 +--
 src/Cxx/Modelling/CMakeLists.txt              |  50 +--
 src/Cxx/Parallel/CMakeLists.txt               |  40 +-
 src/Cxx/Picking/CMakeLists.txt                |  36 +-
 src/Cxx/Plotting/CMakeLists.txt               |  38 +-
 src/Cxx/Points/CMakeLists.txt                 |  56 +--
 src/Cxx/PolyData/CMakeLists.txt               |  94 ++---
 src/Cxx/Qt/CMakeLists.txt                     |  44 +--
 src/Cxx/RectilinearGrid/CMakeLists.txt        |  34 +-
 src/Cxx/Remote/CMakeLists.txt                 |  28 +-
 src/Cxx/RenderMan/CMakeLists.txt              |  34 +-
 src/Cxx/Rendering/CMakeLists.txt              |  50 +--
 src/Cxx/SimpleOperations/CMakeLists.txt       |  36 +-
 src/Cxx/StructuredGrid/CMakeLists.txt         |  36 +-
 src/Cxx/StructuredPoints/CMakeLists.txt       |  38 +-
 src/Cxx/Texture/CMakeLists.txt                |  44 +--
 src/Cxx/UnstructuredGrid/CMakeLists.txt       |  34 +-
 src/Cxx/Utilities/CMakeLists.txt              |  48 +--
 src/Cxx/Video/CMakeLists.txt                  |  26 +-
 src/Cxx/Views/CMakeLists.txt                  |  30 +-
 src/Cxx/Visualization/CMakeLists.txt          |  98 ++---
 .../VisualizationAlgorithms/CMakeLists.txt    |  70 ++--
 .../CMakeLists.txt.orig                       | 102 +++++
 src/Cxx/VolumeRendering/CMakeLists.txt        |  54 +--
 src/Cxx/Widgets/CMakeLists.txt                |  46 +--
 src/Developers/CMakeLists.txt                 |  34 +-
 63 files changed, 1725 insertions(+), 1182 deletions(-)
 create mode 100644 src/Admin/.idea/Admin.iml
 create mode 100644 src/Admin/.idea/codeStyleSettings.xml
 create mode 100644 src/Admin/.idea/dictionaries/jcfr.xml
 create mode 100644 src/Admin/.idea/encodings.xml
 create mode 100644 src/Admin/.idea/inspectionProfiles/Project_Default.xml
 create mode 100644 src/Admin/.idea/inspectionProfiles/profiles_settings.xml
 create mode 100644 src/Admin/.idea/misc.xml
 create mode 100644 src/Admin/.idea/modules.xml
 create mode 100644 src/Admin/.idea/workspace.xml
 create mode 100644 src/Cxx/VisualizationAlgorithms/CMakeLists.txt.orig

diff --git a/CMake/ExamplesTesting.cmake b/CMake/ExamplesTesting.cmake
index f632f7d499e..9c184c8a132 100644
--- a/CMake/ExamplesTesting.cmake
+++ b/CMake/ExamplesTesting.cmake
@@ -2,27 +2,27 @@
 # Create tests for examples
 #
 if (BUILD_TESTING)
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
-SET(MyTests "")
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+set(MyTests "")
 foreach(SOURCE_FILE ${ALL_FILES})
-  STRING(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
-  STRING(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
-  LIST(FIND EXCLUDE_TEST ${EXAMPLE} EXCLUDED)
-  SET(MyTests ${MyTests} Test${EXAMPLE}.cxx)
-  FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/Test${EXAMPLE}.cxx
+  string(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
+  string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
+  list(FIND EXCLUDE_TEST ${EXAMPLE} EXCLUDED)
+  set(MyTests ${MyTests} Test${EXAMPLE}.cxx)
+  file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/Test${EXAMPLE}.cxx
     "#define main Test${EXAMPLE}\n#include \"${EXAMPLE}.cxx\"\n")
   if(EXCLUDED EQUAL -1)
-    LIST(FIND NEEDS_ARGS ${EXAMPLE} SKIP_ADD)
+    list(FIND NEEDS_ARGS ${EXAMPLE} SKIP_ADD)
     if(SKIP_ADD EQUAL -1)
-      ADD_TEST(${KIT}-${EXAMPLE} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests Test${EXAMPLE})
+      add_test(${KIT}-${EXAMPLE} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests Test${EXAMPLE})
     endif(SKIP_ADD EQUAL -1)
     set_property(TEST ${KIT}-${EXAMPLE} PROPERTY LABELS WikiExamples)
   endif()
 endforeach(SOURCE_FILE)
-SET(VTK_BINARY_DIR ${WikiExamples_BINARY_DIR})
-SET(VTK_DATA_ROOT ${WikiExamples_SOURCE_DIR}/src/Testing)
-INCLUDE(${WikiExamples_SOURCE_DIR}/CMake/vtkTestingObjectFactory.cmake)
-ADD_EXECUTABLE(${KIT}CxxTests ${KIT}CxxTests.cxx
+set(VTK_BINARY_DIR ${WikiExamples_BINARY_DIR})
+set(VTK_DATA_ROOT ${WikiExamples_SOURCE_DIR}/src/Testing)
+include(${WikiExamples_SOURCE_DIR}/CMake/vtkTestingObjectFactory.cmake)
+add_executable(${KIT}CxxTests ${KIT}CxxTests.cxx
                ${MyTests})
-TARGET_LINK_LIBRARIES(${KIT}CxxTests ${KIT_LIBS})
+target_link_libraries(${KIT}CxxTests ${KIT_LIBS})
 endif()
\ No newline at end of file
diff --git a/CMake/WikiOutputDirectories.cmake b/CMake/WikiOutputDirectories.cmake
index 7a28c62664c..2fe945d94cd 100644
--- a/CMake/WikiOutputDirectories.cmake
+++ b/CMake/WikiOutputDirectories.cmake
@@ -1,12 +1,12 @@
 if(NOT Module_WikiExamples)
-  IF(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)
-    SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${WikiExamples_BINARY_DIR}/bin CACHE INTERNAL "Single output directory for building all libraries.")
-  ENDIF(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)
-  IF(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
-    SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${WikiExamples_BINARY_DIR}/bin CACHE INTERNAL "Single output directory for building all executables.")
-  ENDIF(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
-  MARK_AS_ADVANCED(CMAKE_LIBRARY_OUTPUT_DIRECTORY CMAKE_RUNTIME_OUTPUT_DIRECTORY)
+  if(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)
+    set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${WikiExamples_BINARY_DIR}/bin CACHE INTERNAL "Single output directory for building all libraries.")
+  endif(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)
+  if(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
+    set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${WikiExamples_BINARY_DIR}/bin CACHE INTERNAL "Single output directory for building all executables.")
+  endif(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
+  mark_as_advanced(CMAKE_LIBRARY_OUTPUT_DIRECTORY CMAKE_RUNTIME_OUTPUT_DIRECTORY)
 else()
-    SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${VTK_BINARY_DIR}/bin)
+    set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${VTK_BINARY_DIR}/bin)
 endif()
 message(STATUS "VTKWikiExamples: Example executables are stored in ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
diff --git a/CMake/vtkTestingObjectFactory.cmake b/CMake/vtkTestingObjectFactory.cmake
index 1d0bfdf18a2..98433a145da 100644
--- a/CMake/vtkTestingObjectFactory.cmake
+++ b/CMake/vtkTestingObjectFactory.cmake
@@ -1,4 +1,4 @@
-SET(CMAKE_TESTDRIVER_BEFORE_TESTMAIN 
+set(CMAKE_TESTDRIVER_BEFORE_TESTMAIN 
 "
     // Set defaults
     vtkTestingInteractor::ValidBaseline =
@@ -63,7 +63,7 @@ SET(CMAKE_TESTDRIVER_BEFORE_TESTMAIN
 "
 )
 
-SET(CMAKE_TESTDRIVER_AFTER_TESTMAIN
+set(CMAKE_TESTDRIVER_AFTER_TESTMAIN
 "    
    if (!interactive)
      {
@@ -82,6 +82,6 @@ SET(CMAKE_TESTDRIVER_AFTER_TESTMAIN
       }
 "
 )
-CREATE_TEST_SOURCELIST(Tests ${KIT}CxxTests.cxx ${MyTests}
+create_test_sourcelist(Tests ${KIT}CxxTests.cxx ${MyTests}
                        EXTRA_INCLUDE ${WikiExamples_SOURCE_DIR}/CMake/vtkTestingObjectFactory.hxx)
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d53a03f8792..ba73bfc4bbe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.3 FATAL_ERROR)
 
-PROJECT(WikiExamples)
+project(WikiExamples)
 
 # Display type of build
 set(_msg "VTKWikiExamples: Building VTKWikiExamples stand-alone")
@@ -51,67 +51,67 @@ include(WikiTestingConfig)
 
 #-----------------------------------------------------------------------------
 # Mac specific
-IF(APPLE)
-  SET(EXECUTABLE_FLAG MACOSX_BUNDLE)
-ENDIF(APPLE)
+if(APPLE)
+  set(EXECUTABLE_FLAG MACOSX_BUNDLE)
+endif(APPLE)
 
 #-----------------------------------------------------------------------------
-ADD_SUBDIRECTORY(src/Cxx/Animation)
-ADD_SUBDIRECTORY(src/Cxx/CompositeData)
-IF(VTK_USE_MYSQL)
-  ADD_SUBDIRECTORY(src/Cxx/Databases)
-ENDIF(VTK_USE_MYSQL)
-ADD_SUBDIRECTORY(src/Cxx/DataStructures)
+add_subdirectory(src/Cxx/Animation)
+add_subdirectory(src/Cxx/CompositeData)
+if(VTK_USE_MYSQL)
+  add_subdirectory(src/Cxx/Databases)
+endif(VTK_USE_MYSQL)
+add_subdirectory(src/Cxx/DataStructures)
 if(${VTK_VERSION} VERSION_GREATER "6.10")
-  ADD_SUBDIRECTORY(src/Cxx/Developers)
+  add_subdirectory(src/Cxx/Developers)
 endif()
-ADD_SUBDIRECTORY(src/Cxx/Filtering)
-ADD_SUBDIRECTORY(src/Cxx/GeometricObjects)
-IF(VTK_USE_INFOVIS)
-  IF(VTK_USE_BOOST)
-    ADD_SUBDIRECTORY(src/Cxx/Graphs)
-  ENDIF(VTK_USE_BOOST)
-ENDIF(VTK_USE_INFOVIS)
-ADD_SUBDIRECTORY(src/Cxx/ImageData)
-  ADD_SUBDIRECTORY(src/Cxx/Geovis)
-ADD_SUBDIRECTORY(src/Cxx/HyperTreeGrid)
-ADD_SUBDIRECTORY(src/Cxx/Images)
-ADD_SUBDIRECTORY(src/Cxx/ImplicitFunctions)
-ADD_SUBDIRECTORY(src/Cxx/InfoVis)
-ADD_SUBDIRECTORY(src/Cxx/Interaction)
-ADD_SUBDIRECTORY(src/Cxx/IO)
-ADD_SUBDIRECTORY(src/Cxx/Lighting)
-ADD_SUBDIRECTORY(src/Cxx/Math)
-ADD_SUBDIRECTORY(src/Cxx/Medical)
-ADD_SUBDIRECTORY(src/Cxx/Meshes)
-ADD_SUBDIRECTORY(src/Cxx/Modelling)
-IF(VTK_USE_PARALLEL)
-  ADD_SUBDIRECTORY(src/Cxx/Parallel)
-ENDIF(VTK_USE_PARALLEL)
-ADD_SUBDIRECTORY(src/Cxx/Picking)
-ADD_SUBDIRECTORY(src/Cxx/Plotting)
-ADD_SUBDIRECTORY(src/Cxx/PolyData)
-ADD_SUBDIRECTORY(src/Cxx/Points)
-ADD_SUBDIRECTORY(src/Cxx/RectilinearGrid)
-ADD_SUBDIRECTORY(src/Cxx/Remote)
-ADD_SUBDIRECTORY(src/Cxx/Rendering)
-ADD_SUBDIRECTORY(src/Cxx/RenderMan)
-ADD_SUBDIRECTORY(src/Cxx/SimpleOperations)
-ADD_SUBDIRECTORY(src/Cxx/StructuredGrid)
-ADD_SUBDIRECTORY(src/Cxx/StructuredPoints)
-ADD_SUBDIRECTORY(src/Cxx/Texture)
-ADD_SUBDIRECTORY(src/Cxx/UnstructuredGrid)
-ADD_SUBDIRECTORY(src/Cxx/Utilities)
-ADD_SUBDIRECTORY(src/Cxx/Video)
-IF(VTK_USE_VIEWS)
-  ADD_SUBDIRECTORY(src/Cxx/Views)
-ENDIF(VTK_USE_VIEWS)
-ADD_SUBDIRECTORY(src/Cxx/Visualization)
-ADD_SUBDIRECTORY(src/Cxx/VisualizationAlgorithms)
-ADD_SUBDIRECTORY(src/Cxx/VolumeRendering)
-ADD_SUBDIRECTORY(src/Cxx/Widgets)
+add_subdirectory(src/Cxx/Filtering)
+add_subdirectory(src/Cxx/GeometricObjects)
+if(VTK_USE_INFOVIS)
+  if(VTK_USE_BOOST)
+    add_subdirectory(src/Cxx/Graphs)
+  endif(VTK_USE_BOOST)
+endif(VTK_USE_INFOVIS)
+add_subdirectory(src/Cxx/ImageData)
+  add_subdirectory(src/Cxx/Geovis)
+add_subdirectory(src/Cxx/HyperTreeGrid)
+add_subdirectory(src/Cxx/Images)
+add_subdirectory(src/Cxx/ImplicitFunctions)
+add_subdirectory(src/Cxx/InfoVis)
+add_subdirectory(src/Cxx/Interaction)
+add_subdirectory(src/Cxx/IO)
+add_subdirectory(src/Cxx/Lighting)
+add_subdirectory(src/Cxx/Math)
+add_subdirectory(src/Cxx/Medical)
+add_subdirectory(src/Cxx/Meshes)
+add_subdirectory(src/Cxx/Modelling)
+if(VTK_USE_PARALLEL)
+  add_subdirectory(src/Cxx/Parallel)
+endif(VTK_USE_PARALLEL)
+add_subdirectory(src/Cxx/Picking)
+add_subdirectory(src/Cxx/Plotting)
+add_subdirectory(src/Cxx/PolyData)
+add_subdirectory(src/Cxx/Points)
+add_subdirectory(src/Cxx/RectilinearGrid)
+add_subdirectory(src/Cxx/Remote)
+add_subdirectory(src/Cxx/Rendering)
+add_subdirectory(src/Cxx/RenderMan)
+add_subdirectory(src/Cxx/SimpleOperations)
+add_subdirectory(src/Cxx/StructuredGrid)
+add_subdirectory(src/Cxx/StructuredPoints)
+add_subdirectory(src/Cxx/Texture)
+add_subdirectory(src/Cxx/UnstructuredGrid)
+add_subdirectory(src/Cxx/Utilities)
+add_subdirectory(src/Cxx/Video)
+if(VTK_USE_VIEWS)
+  add_subdirectory(src/Cxx/Views)
+endif(VTK_USE_VIEWS)
+add_subdirectory(src/Cxx/Visualization)
+add_subdirectory(src/Cxx/VisualizationAlgorithms)
+add_subdirectory(src/Cxx/VolumeRendering)
+add_subdirectory(src/Cxx/Widgets)
 
-# ADD_SUBDIRECTORY(Python/GeometricObjects)
+# add_subdirectory(Python/GeometricObjects)
 
 if(vtkGUISupportQt_LOADED)
   message(STATUS "VTKWikiExamples: Building Qt examples")
@@ -121,10 +121,10 @@ if(vtkGUISupportQt_LOADED)
     # We have ui files, this will bring in the macro: qt5_wrap_ui
     find_package(Qt5Widgets REQUIRED QUIET)
   else()
-    FIND_PACKAGE(Qt4 REQUIRED)
-    INCLUDE(${QT_USE_FILE})
+    find_package(Qt4 REQUIRED)
+    include(${QT_USE_FILE})
   endif()
-  ADD_SUBDIRECTORY(src/Cxx/Qt)
+  add_subdirectory(src/Cxx/Qt)
 else()
   message(STATUS "VTKWikiExamples: Not building Qt examples")
 endif()
diff --git a/CTestConfig.cmake b/CTestConfig.cmake
index c75a0f12164..e37a222d817 100644
--- a/CTestConfig.cmake
+++ b/CTestConfig.cmake
@@ -2,8 +2,8 @@
 ## Then modify the CMakeLists.txt file in the root directory of your
 ## project to incorporate the testing dashboard.
 ## # The following are required to uses Dart and the Cdash dashboard
-##   ENABLE_TESTING()
-##   INCLUDE(CTest)
+##   enable_testing()
+##   include(CTest)
 set(CTEST_PROJECT_NAME "WikiExamples")
 set(CTEST_NIGHTLY_START_TIME "01:00:00 UTC")
 
diff --git a/src/Admin/.idea/Admin.iml b/src/Admin/.idea/Admin.iml
new file mode 100644
index 00000000000..debed3cc0f8
--- /dev/null
+++ b/src/Admin/.idea/Admin.iml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="jdk" jdkName="Python 3.5.0+ virtualenv at ~/.virtualenvs/scikit-build-35" jdkType="Python SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+  <component name="TestRunnerService">
+    <option name="PROJECT_TEST_RUNNER" value="Unittests" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/src/Admin/.idea/codeStyleSettings.xml b/src/Admin/.idea/codeStyleSettings.xml
new file mode 100644
index 00000000000..c4c954319c8
--- /dev/null
+++ b/src/Admin/.idea/codeStyleSettings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectCodeStyleSettingsManager">
+    <option name="PER_PROJECT_SETTINGS">
+      <value />
+    </option>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default (1)" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/Admin/.idea/dictionaries/jcfr.xml b/src/Admin/.idea/dictionaries/jcfr.xml
new file mode 100644
index 00000000000..d0d5f73def0
--- /dev/null
+++ b/src/Admin/.idea/dictionaries/jcfr.xml
@@ -0,0 +1,3 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="jcfr" />
+</component>
\ No newline at end of file
diff --git a/src/Admin/.idea/encodings.xml b/src/Admin/.idea/encodings.xml
new file mode 100644
index 00000000000..97626ba4544
--- /dev/null
+++ b/src/Admin/.idea/encodings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="PROJECT" charset="UTF-8" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/Admin/.idea/inspectionProfiles/Project_Default.xml b/src/Admin/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 00000000000..8d66637cb9f
--- /dev/null
+++ b/src/Admin/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,5 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+  </profile>
+</component>
\ No newline at end of file
diff --git a/src/Admin/.idea/inspectionProfiles/profiles_settings.xml b/src/Admin/.idea/inspectionProfiles/profiles_settings.xml
new file mode 100644
index 00000000000..105ce2da2d6
--- /dev/null
+++ b/src/Admin/.idea/inspectionProfiles/profiles_settings.xml
@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <settings>
+    <option name="USE_PROJECT_PROFILE" value="false" />
+    <version value="1.0" />
+  </settings>
+</component>
\ No newline at end of file
diff --git a/src/Admin/.idea/misc.xml b/src/Admin/.idea/misc.xml
new file mode 100644
index 00000000000..27fb4898618
--- /dev/null
+++ b/src/Admin/.idea/misc.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.5.0+ virtualenv at ~/.virtualenvs/scikit-build-35" project-jdk-type="Python SDK" />
+  <component name="masterDetails">
+    <states>
+      <state key="ScopeChooserConfigurable.UI">
+        <settings>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+    </states>
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/Admin/.idea/modules.xml b/src/Admin/.idea/modules.xml
new file mode 100644
index 00000000000..39ffcf438d4
--- /dev/null
+++ b/src/Admin/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/Admin.iml" filepath="$PROJECT_DIR$/.idea/Admin.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/Admin/.idea/workspace.xml b/src/Admin/.idea/workspace.xml
new file mode 100644
index 00000000000..c7c9b9af279
--- /dev/null
+++ b/src/Admin/.idea/workspace.xml
@@ -0,0 +1,374 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="9d141abf-409a-4d86-8e59-c29ffc7d85b5" name="Default" comment="" />
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
+    <option name="TRACKING_ENABLED" value="true" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="CreatePatchCommitExecutor">
+    <option name="PATCH_PATH" value="" />
+  </component>
+  <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
+  <component name="FileEditorManager">
+    <leaf>
+      <file leaf-file-name="FindMissingExamples.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/FindMissingExamples.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="462">
+              <caret line="134" column="0" lean-forward="false" selection-start-line="134" selection-start-column="0" selection-end-line="134" selection-end-column="0" />
+              <folding>
+                <element signature="e#47#84#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="sitemap_gen.py" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/sitemap_gen.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="299">
+              <caret line="180" column="19" lean-forward="false" selection-start-line="180" selection-start-column="19" selection-end-line="180" selection-end-column="19" />
+              <folding>
+                <element signature="e#654#664#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="sitemapGenerator" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/sitemapGenerator">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="0">
+              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="VTKClassesUsedInExamples.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/VTKClassesUsedInExamples.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="408">
+              <caret line="198" column="73" lean-forward="false" selection-start-line="198" selection-start-column="73" selection-end-line="198" selection-end-column="73" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
+  <component name="FindInProjectRecents">
+    <findStrings>
+      <find>print</find>
+      <find>print</find>
+    </findStrings>
+    <replaceStrings>
+      <replace># end</replace>
+      <replace>is None</replace>
+      <replace>print(</replace>
+    </replaceStrings>
+  </component>
+  <component name="IdeDocumentHistory">
+    <option name="CHANGED_PATHS">
+      <list>
+        <option value="$PROJECT_DIR$/VTKClassesUsedInExamples.py" />
+        <option value="$PROJECT_DIR$/FindMissingExamples.py" />
+        <option value="$PROJECT_DIR$/sitemap_gen.py" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectFrameBounds">
+    <option name="x" value="65" />
+    <option name="y" value="-4" />
+    <option name="width" value="1855" />
+    <option name="height" value="1084" />
+  </component>
+  <component name="ProjectInspectionProfilesVisibleTreeState">
+    <entry key="Project Default">
+      <profile-state>
+        <expanded-state>
+          <State>
+            <id />
+          </State>
+          <State>
+            <id>General</id>
+          </State>
+        </expanded-state>
+        <selected-state>
+          <State>
+            <id>BashSupport</id>
+          </State>
+        </selected-state>
+      </profile-state>
+    </entry>
+  </component>
+  <component name="ProjectView">
+    <navigator currentView="ProjectPane" proportions="" version="1">
+      <flattenPackages />
+      <showMembers />
+      <showModules />
+      <showLibraryContents />
+      <hideEmptyPackages />
+      <abbreviatePackageNames />
+      <autoscrollToSource />
+      <autoscrollFromSource />
+      <sortByType />
+      <manualOrder />
+      <foldersAlwaysOnTop value="true" />
+    </navigator>
+    <panes>
+      <pane id="Scope" />
+      <pane id="ProjectPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Admin" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Admin" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
+      <pane id="Scratches" />
+    </panes>
+  </component>
+  <component name="PropertiesComponent">
+    <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+  </component>
+  <component name="RunManager">
+    <configuration default="true" type="BashConfigurationType" factoryName="Bash">
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="INTERPRETER_PATH" value="/bin/bash" />
+      <option name="WORKING_DIRECTORY" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <option name="SCRIPT_NAME" value="" />
+      <option name="PARAMETERS" value="" />
+      <module name="" />
+      <envs />
+      <method />
+    </configuration>
+    <configuration default="true" type="PythonConfigurationType" factoryName="Python">
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs>
+        <env name="PYTHONUNBUFFERED" value="1" />
+      </envs>
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="" />
+      <option name="IS_MODULE_SDK" value="false" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <module name="Admin" />
+      <option name="SCRIPT_NAME" value="" />
+      <option name="PARAMETERS" value="" />
+      <option name="SHOW_COMMAND_LINE" value="false" />
+      <method />
+    </configuration>
+    <configuration default="true" type="Tox" factoryName="Tox">
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs />
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="" />
+      <option name="IS_MODULE_SDK" value="false" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <module name="Admin" />
+      <method />
+    </configuration>
+    <configuration default="true" type="tests" factoryName="Attests">
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs />
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="" />
+      <option name="IS_MODULE_SDK" value="false" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <module name="Admin" />
+      <option name="SCRIPT_NAME" value="" />
+      <option name="CLASS_NAME" value="" />
+      <option name="METHOD_NAME" value="" />
+      <option name="FOLDER_NAME" value="" />
+      <option name="TEST_TYPE" value="TEST_SCRIPT" />
+      <option name="PATTERN" value="" />
+      <option name="USE_PATTERN" value="false" />
+      <method />
+    </configuration>
+    <configuration default="true" type="tests" factoryName="Doctests">
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs />
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="" />
+      <option name="IS_MODULE_SDK" value="false" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <module name="Admin" />
+      <option name="SCRIPT_NAME" value="" />
+      <option name="CLASS_NAME" value="" />
+      <option name="METHOD_NAME" value="" />
+      <option name="FOLDER_NAME" value="" />
+      <option name="TEST_TYPE" value="TEST_SCRIPT" />
+      <option name="PATTERN" value="" />
+      <option name="USE_PATTERN" value="false" />
+      <method />
+    </configuration>
+    <configuration default="true" type="tests" factoryName="Nosetests">
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs />
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="" />
+      <option name="IS_MODULE_SDK" value="false" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <module name="Admin" />
+      <option name="SCRIPT_NAME" value="" />
+      <option name="CLASS_NAME" value="" />
+      <option name="METHOD_NAME" value="" />
+      <option name="FOLDER_NAME" value="" />
+      <option name="TEST_TYPE" value="TEST_SCRIPT" />
+      <option name="PATTERN" value="" />
+      <option name="USE_PATTERN" value="false" />
+      <option name="PARAMS" value="" />
+      <option name="USE_PARAM" value="false" />
+      <method />
+    </configuration>
+    <configuration default="true" type="tests" factoryName="Unittests">
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs />
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="" />
+      <option name="IS_MODULE_SDK" value="false" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <module name="Admin" />
+      <option name="SCRIPT_NAME" value="" />
+      <option name="CLASS_NAME" value="" />
+      <option name="METHOD_NAME" value="" />
+      <option name="FOLDER_NAME" value="" />
+      <option name="TEST_TYPE" value="TEST_SCRIPT" />
+      <option name="PATTERN" value="" />
+      <option name="USE_PATTERN" value="false" />
+      <option name="PUREUNITTEST" value="true" />
+      <option name="PARAMS" value="" />
+      <option name="USE_PARAM" value="false" />
+      <method />
+    </configuration>
+    <configuration default="true" type="tests" factoryName="py.test">
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs />
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="" />
+      <option name="IS_MODULE_SDK" value="false" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <module name="Admin" />
+      <option name="SCRIPT_NAME" value="" />
+      <option name="CLASS_NAME" value="" />
+      <option name="METHOD_NAME" value="" />
+      <option name="FOLDER_NAME" value="" />
+      <option name="TEST_TYPE" value="TEST_SCRIPT" />
+      <option name="PATTERN" value="" />
+      <option name="USE_PATTERN" value="false" />
+      <option name="testToRun" value="" />
+      <option name="keywords" value="" />
+      <option name="params" value="" />
+      <option name="USE_PARAM" value="false" />
+      <option name="USE_KEYWORD" value="false" />
+      <method />
+    </configuration>
+  </component>
+  <component name="ShelveChangesManager" show_recycled="false">
+    <option name="remove_strategy" value="false" />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="9d141abf-409a-4d86-8e59-c29ffc7d85b5" name="Default" comment="" />
+      <created>1508617213195</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1508617213195</updated>
+    </task>
+    <servers />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="65" y="-4" width="1855" height="1084" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+    </layout>
+  </component>
+  <component name="VcsContentAnnotationSettings">
+    <option name="myLimit" value="2678400000" />
+  </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager />
+    <watches-manager />
+  </component>
+  <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/VTKClassesUsedInExamples.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="408">
+          <caret line="198" column="73" lean-forward="false" selection-start-line="198" selection-start-column="73" selection-end-line="198" selection-end-column="73" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/sitemapGenerator">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FindMissingExamples.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="462">
+          <caret line="134" column="0" lean-forward="false" selection-start-line="134" selection-start-column="0" selection-end-line="134" selection-end-column="0" />
+          <folding>
+            <element signature="e#47#84#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/sitemap_gen.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="299">
+          <caret line="180" column="19" lean-forward="false" selection-start-line="180" selection-start-column="19" selection-end-line="180" selection-end-column="19" />
+          <folding>
+            <element signature="e#654#664#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/Cxx/Animation/CMakeLists.txt b/src/Cxx/Animation/CMakeLists.txt
index 4f9caac5ba4..aeab2ea3cbd 100644
--- a/src/Cxx/Animation/CMakeLists.txt
+++ b/src/Cxx/Animation/CMakeLists.txt
@@ -1,28 +1,28 @@
-PROJECT (${WIKI}Animation)
+project (${WIKI}Animation)
 
-IF(NOT WikiExamples_BINARY_DIR)
-FIND_PACKAGE(VTK REQUIRED)
-IF(NOT VTK_USE_RENDERING)
-  MESSAGE(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
-ENDIF(NOT VTK_USE_RENDERING)
-INCLUDE(${VTK_USE_FILE})
-ENDIF(NOT WikiExamples_BINARY_DIR)
+if(NOT WikiExamples_BINARY_DIR)
+find_package(VTK REQUIRED)
+if(NOT VTK_USE_RENDERING)
+  message(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
+endif(NOT VTK_USE_RENDERING)
+include(${VTK_USE_FILE})
+endif(NOT WikiExamples_BINARY_DIR)
 
-SET(KIT Animation)
+set(KIT Animation)
 if("${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" LESS 5.8)
-  SET(KIT_LIBS vtkHybrid vtkRendering)
+  set(KIT_LIBS vtkHybrid vtkRendering)
 else()
-  SET(KIT_LIBS ${VTK_LIBRARIES})
+  set(KIT_LIBS ${VTK_LIBRARIES})
 endif()
 
 #
 # Build all .cxx files in the directory
-FILE(GLOB ALL_FILES *.cxx)
+file(GLOB ALL_FILES *.cxx)
 foreach(SOURCE_FILE ${ALL_FILES})
-  STRING(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
-  STRING(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
-  ADD_EXECUTABLE(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
-  TARGET_LINK_LIBRARIES(${WIKI}${EXAMPLE} ${KIT_LIBS})
+  string(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
+  string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
+  add_executable(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
+  target_link_libraries(${WIKI}${EXAMPLE} ${KIT_LIBS})
 endforeach(SOURCE_FILE)
 
 # Testing
diff --git a/src/Cxx/CMakeTechniques/CheckForModule.cmake b/src/Cxx/CMakeTechniques/CheckForModule.cmake
index 9a3859735f7..bdea1f69921 100644
--- a/src/Cxx/CMakeTechniques/CheckForModule.cmake
+++ b/src/Cxx/CMakeTechniques/CheckForModule.cmake
@@ -1,16 +1,16 @@
 ```cmake
 cmake_minimum_required(VERSION 2.6)
  
-PROJECT(CheckForModule)
+project(CheckForModule)
  
-FIND_PACKAGE(VTK REQUIRED)
-INCLUDE(${VTK_USE_FILE})
+find_package(VTK REQUIRED)
+include(${VTK_USE_FILE})
  
 find_package(VTK REQUIRED)
 if(NOT vtkIOParallel_LOADED)
   message(FATAL_ERROR "vtkIOParallel is required but not available.")
 endif()
  
-ADD_EXECUTABLE(CheckForModule CheckForModule.cxx)
-TARGET_LINK_LIBRARIES(CheckForModule ${VTK_LIBRARIES})
+add_executable(CheckForModule CheckForModule.cxx)
+target_link_libraries(CheckForModule ${VTK_LIBRARIES})
 ```
diff --git a/src/Cxx/CompositeData/CMakeLists.txt b/src/Cxx/CompositeData/CMakeLists.txt
index 58f5093bb67..1b1754a3d4d 100644
--- a/src/Cxx/CompositeData/CMakeLists.txt
+++ b/src/Cxx/CompositeData/CMakeLists.txt
@@ -1,47 +1,47 @@
-PROJECT (${WIKI}CompositeData)
+project (${WIKI}CompositeData)
 
-IF(NOT WikiExamples_BINARY_DIR)
-FIND_PACKAGE(VTK REQUIRED)
-IF(NOT VTK_USE_RENDERING)
-  MESSAGE(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
-ENDIF(NOT VTK_USE_RENDERING)
-INCLUDE(${VTK_USE_FILE})
-ENDIF(NOT WikiExamples_BINARY_DIR)
+if(NOT WikiExamples_BINARY_DIR)
+find_package(VTK REQUIRED)
+if(NOT VTK_USE_RENDERING)
+  message(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
+endif(NOT VTK_USE_RENDERING)
+include(${VTK_USE_FILE})
+endif(NOT WikiExamples_BINARY_DIR)
 
 if("${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" LESS 5.8)
-  SET(KIT_LIBS vtkFiltering vtkHybrid)
+  set(KIT_LIBS vtkFiltering vtkHybrid)
 else()
-  SET(KIT_LIBS ${VTK_LIBRARIES})
+  set(KIT_LIBS ${VTK_LIBRARIES})
 endif()
 #
 # Build all .cxx files in the directory
-FILE(GLOB ALL_FILES *.cxx)
+file(GLOB ALL_FILES *.cxx)
 foreach(SOURCE_FILE ${ALL_FILES})
-  STRING(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
-  STRING(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
-  ADD_EXECUTABLE(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
-  TARGET_LINK_LIBRARIES(${WIKI}${EXAMPLE} ${KIT_LIBS})
+  string(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
+  string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
+  add_executable(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
+  target_link_libraries(${WIKI}${EXAMPLE} ${KIT_LIBS})
 endforeach(SOURCE_FILE)
 
 if (BUILD_TESTING)
 # Testing
-SET(KIT CompositeData)
-SET(NEEDS_ARGS
+set(KIT CompositeData)
+set(NEEDS_ARGS
   OverlappingAMR
 )
 
-SET (EXCLUDE_TEST
+set (EXCLUDE_TEST
   HierarchicalBoxPipeline
   Generate3DAMRDataSetWithPulse
 )
 
-ADD_TEST(${KIT}-OverlappingAMR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-OverlappingAMR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestOverlappingAMR -E 35)
-ADD_TEST(${KIT}-CompositePolyDataMapper ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-CompositePolyDataMapper ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestCompositePolyDataMapper)
-ADD_TEST(${KIT}-MultiBlockDataSet ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-MultiBlockDataSet ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestMultiBlockDataSet)
 
-INCLUDE(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
+include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
 
 endif()
diff --git a/src/Cxx/DataStructures/CMakeLists.txt b/src/Cxx/DataStructures/CMakeLists.txt
index 5da5b12d2ca..7037ff55a50 100644
--- a/src/Cxx/DataStructures/CMakeLists.txt
+++ b/src/Cxx/DataStructures/CMakeLists.txt
@@ -1,33 +1,33 @@
-PROJECT (${WIKI}DataStructures)
+project (${WIKI}DataStructures)
 
-IF(NOT WikiExamples_BINARY_DIR)
-FIND_PACKAGE(VTK REQUIRED)
-IF(NOT VTK_USE_RENDERING)
-  MESSAGE(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
-ENDIF(NOT VTK_USE_RENDERING)
-INCLUDE(${VTK_USE_FILE})
-ENDIF(NOT WikiExamples_BINARY_DIR)
+if(NOT WikiExamples_BINARY_DIR)
+find_package(VTK REQUIRED)
+if(NOT VTK_USE_RENDERING)
+  message(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
+endif(NOT VTK_USE_RENDERING)
+include(${VTK_USE_FILE})
+endif(NOT WikiExamples_BINARY_DIR)
 
 if("${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" LESS 6.0)
-  SET(KIT_LIBS vtkHybrid vtkRendering vtkWidgets vtkCharts)
+  set(KIT_LIBS vtkHybrid vtkRendering vtkWidgets vtkCharts)
 else()
-  SET(KIT_LIBS ${VTK_LIBRARIES})
+  set(KIT_LIBS ${VTK_LIBRARIES})
 endif()
 
 #
 # Build all .cxx files in the directory
-FILE(GLOB ALL_FILES *.cxx)
+file(GLOB ALL_FILES *.cxx)
 foreach(SOURCE_FILE ${ALL_FILES})
-  STRING(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
-  STRING(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
-  ADD_EXECUTABLE(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
-  TARGET_LINK_LIBRARIES(${WIKI}${EXAMPLE} ${KIT_LIBS})
+  string(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
+  string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
+  add_executable(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
+  target_link_libraries(${WIKI}${EXAMPLE} ${KIT_LIBS})
 endforeach(SOURCE_FILE)
 
 if (BUILD_TESTING)
 # Testing
-SET(KIT DataStructures)
-SET(NEEDS_ARGS
+set(KIT DataStructures)
+set(NEEDS_ARGS
   DataStructureComparison
   VisualizeKDTree
   VisualizeOBBTree
@@ -37,32 +37,32 @@ SET(NEEDS_ARGS
   OctreeTimingDemo
   OctreeVisualize
 )
-SET(DATA ${WikiExamples_SOURCE_DIR}/src/Testing/Data)
+set(DATA ${WikiExamples_SOURCE_DIR}/src/Testing/Data)
 
-ADD_TEST(${KIT}-DataStructureComparison ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-DataStructureComparison ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestDataStructureComparison ${DATA}/Bunny.vtp -E 20)
 
-ADD_TEST(${KIT}-VisualizeKDTree ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-VisualizeKDTree ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestVisualizeKDTree -E 40)
-ADD_TEST(${KIT}-VisualizeOBBTree ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-VisualizeOBBTree ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestVisualizeOBBTree -E 40)
 
 # These tests will generate different output each time they run.
 # To avoid regression failures, set the error tolerance to a large number. 
-ADD_TEST(${KIT}-KDTreeTimingDemo ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-KDTreeTimingDemo ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestKDTreeTimingDemo -E 999999)
-ADD_TEST(${KIT}-ModifiedBSPTreeTimingDemo ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ModifiedBSPTreeTimingDemo ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestModifiedBSPTreeTimingDemo -E 999999)
-ADD_TEST(${KIT}-OBBTreeTimingDemo ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-OBBTreeTimingDemo ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestOBBTreeTimingDemo -E 999999)
-ADD_TEST(${KIT}-OctreeTimingDemo ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-OctreeTimingDemo ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestOctreeTimingDemo -E 999999)
 
-ADD_TEST(${KIT}-OctreeVisualize ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-OctreeVisualize ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestOctreeVisualize -E 40)
 
-INCLUDE(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
+include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
 
-ADD_SUBDIRECTORY(ModifiedBSPTree)
+add_subdirectory(ModifiedBSPTree)
 
 endif()
diff --git a/src/Cxx/DataStructures/ModifiedBSPTree/CMakeLists.txt b/src/Cxx/DataStructures/ModifiedBSPTree/CMakeLists.txt
index 79ad8858f65..3fdc3fd4158 100644
--- a/src/Cxx/DataStructures/ModifiedBSPTree/CMakeLists.txt
+++ b/src/Cxx/DataStructures/ModifiedBSPTree/CMakeLists.txt
@@ -1,36 +1,36 @@
-PROJECT (${WIKI}DataStructuresModifiedBSPTree)
+project (${WIKI}DataStructuresModifiedBSPTree)
 
-IF(NOT WikiExamples_BINARY_DIR)
-FIND_PACKAGE(VTK REQUIRED)
-IF(NOT VTK_USE_RENDERING)
-  MESSAGE(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
-ENDIF(NOT VTK_USE_RENDERING)
-INCLUDE(${VTK_USE_FILE})
-ENDIF(NOT WikiExamples_BINARY_DIR)
+if(NOT WikiExamples_BINARY_DIR)
+find_package(VTK REQUIRED)
+if(NOT VTK_USE_RENDERING)
+  message(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
+endif(NOT VTK_USE_RENDERING)
+include(${VTK_USE_FILE})
+endif(NOT WikiExamples_BINARY_DIR)
 
 if("${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" LESS 6.0)
-  SET(KIT_LIBS vtkWidgets vtkHybrid vtkCharts)
+  set(KIT_LIBS vtkWidgets vtkHybrid vtkCharts)
 else()
-  SET(KIT_LIBS ${VTK_LIBRARIES})
+  set(KIT_LIBS ${VTK_LIBRARIES})
 endif()
 #
 # Build all .cxx files in the directory
-FILE(GLOB ALL_FILES *.cxx)
+file(GLOB ALL_FILES *.cxx)
 foreach(SOURCE_FILE ${ALL_FILES})
-  STRING(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
-  STRING(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
-  ADD_EXECUTABLE(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
-  TARGET_LINK_LIBRARIES(${WIKI}${EXAMPLE} ${KIT_LIBS})
+  string(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
+  string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
+  add_executable(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
+  target_link_libraries(${WIKI}${EXAMPLE} ${KIT_LIBS})
 endforeach(SOURCE_FILE)
 
 # Testing
-SET(KIT DataStructuresModifiedBSPTree)
-SET(NEEDS_ARGS
+set(KIT DataStructuresModifiedBSPTree)
+set(NEEDS_ARGS
   VisualizeModifiedBSPTree
 )
-SET(DATA ${WikiExamples_SOURCE_DIR}/src/Testing/Data)
+set(DATA ${WikiExamples_SOURCE_DIR}/src/Testing/Data)
 
-ADD_TEST(${KIT}-VisualizeModifiedBSPTree ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-VisualizeModifiedBSPTree ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestVisualizeModifiedBSPTree -E 40)
 
-INCLUDE(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
+include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
diff --git a/src/Cxx/DataStructures/Octree/CMakeLists.txt b/src/Cxx/DataStructures/Octree/CMakeLists.txt
index 5ab47a0d31a..1eb41477a12 100644
--- a/src/Cxx/DataStructures/Octree/CMakeLists.txt
+++ b/src/Cxx/DataStructures/Octree/CMakeLists.txt
@@ -1,32 +1,32 @@
-PROJECT (${WIKI}DataStructuresOctree)
+project (${WIKI}DataStructuresOctree)
 
-IF(NOT WikiExamples_BINARY_DIR)
-FIND_PACKAGE(VTK REQUIRED)
-IF(NOT VTK_USE_RENDERING)
-  MESSAGE(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
-ENDIF(NOT VTK_USE_RENDERING)
-INCLUDE(${VTK_USE_FILE})
-ENDIF(NOT WikiExamples_BINARY_DIR)
+if(NOT WikiExamples_BINARY_DIR)
+find_package(VTK REQUIRED)
+if(NOT VTK_USE_RENDERING)
+  message(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
+endif(NOT VTK_USE_RENDERING)
+include(${VTK_USE_FILE})
+endif(NOT WikiExamples_BINARY_DIR)
 
 if("${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" LESS 5.8)
-  SET(KIT_LIBS vtkWidgets vtkHybrid)
+  set(KIT_LIBS vtkWidgets vtkHybrid)
 else()
-  SET(KIT_LIBS ${VTK_LIBRARIES})
+  set(KIT_LIBS ${VTK_LIBRARIES})
 endif()
 #
 # Build all .cxx files in the directory
-FILE(GLOB ALL_FILES *.cxx)
+file(GLOB ALL_FILES *.cxx)
 foreach(SOURCE_FILE ${ALL_FILES})
-  STRING(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
-  STRING(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
-  ADD_EXECUTABLE(${WIKI}${EXAMPLE} ${EXAMPLE}.cxx)
-  TARGET_LINK_LIBRARIES(${WIKI}${EXAMPLE} ${KIT_LIBS})
+  string(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
+  string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
+  add_executable(${WIKI}${EXAMPLE} ${EXAMPLE}.cxx)
+  target_link_libraries(${WIKI}${EXAMPLE} ${KIT_LIBS})
 endforeach(SOURCE_FILE)
 
 # Testing
-SET(KIT DataStructuresOctree)
-SET(NEEDS_ARGS
+set(KIT DataStructuresOctree)
+set(NEEDS_ARGS
 )
-INCLUDE(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
-SET(DATA ${WikiExamples_SOURCE_DIR}/src/Testing/Data)
+include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
+set(DATA ${WikiExamples_SOURCE_DIR}/src/Testing/Data)
 
diff --git a/src/Cxx/Databases/CMakeLists.txt b/src/Cxx/Databases/CMakeLists.txt
index 637afbe5ddf..c4c44bf99c1 100644
--- a/src/Cxx/Databases/CMakeLists.txt
+++ b/src/Cxx/Databases/CMakeLists.txt
@@ -1 +1 @@
-ADD_SUBDIRECTORY(SQL)
+add_subdirectory(SQL)
diff --git a/src/Cxx/Databases/SQL/MySQL/CMakeLists.txt b/src/Cxx/Databases/SQL/MySQL/CMakeLists.txt
index 04245711eff..5cdf5aeb359 100644
--- a/src/Cxx/Databases/SQL/MySQL/CMakeLists.txt
+++ b/src/Cxx/Databases/SQL/MySQL/CMakeLists.txt
@@ -1,27 +1,27 @@
-PROJECT (${WIKI}MySQL)
+project (${WIKI}MySQL)
 
-IF(NOT WikiExamples_BINARY_DIR)
-FIND_PACKAGE(VTK REQUIRED)
-INCLUDE(${VTK_USE_FILE})
-ENDIF(NOT WikiExamples_BINARY_DIR)
+if(NOT WikiExamples_BINARY_DIR)
+find_package(VTK REQUIRED)
+include(${VTK_USE_FILE})
+endif(NOT WikiExamples_BINARY_DIR)
 
 if("${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" LESS 5.8)
-  SET(KIT_LIBS vtkRendering vtkHybrid)
+  set(KIT_LIBS vtkRendering vtkHybrid)
 else()
-  SET(KIT_LIBS ${VTK_LIBRARIES})
+  set(KIT_LIBS ${VTK_LIBRARIES})
 endif()
 #
 # Build all .cxx files in the directory
-FILE(GLOB ALL_FILES *.cxx)
+file(GLOB ALL_FILES *.cxx)
 foreach(SOURCE_FILE ${ALL_FILES})
-  STRING(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
-  STRING(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
-  ADD_EXECUTABLE(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
-  TARGET_LINK_LIBRARIES(${WIKI}${EXAMPLE} ${KIT_LIBS})
+  string(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
+  string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
+  add_executable(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
+  target_link_libraries(${WIKI}${EXAMPLE} ${KIT_LIBS})
 endforeach(SOURCE_FILE)
 
 # Testing
-SET(KIT MySQL)
-SET(NEEDS_ARGS
+set(KIT MySQL)
+set(NEEDS_ARGS
 )
-INCLUDE(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
+include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
diff --git a/src/Cxx/Developers/CMakeLists.txt b/src/Cxx/Developers/CMakeLists.txt
index 3d5934dbaf8..86879ea367b 100644
--- a/src/Cxx/Developers/CMakeLists.txt
+++ b/src/Cxx/Developers/CMakeLists.txt
@@ -1,40 +1,40 @@
-PROJECT (${WIKI}Developers)
+project (${WIKI}Developers)
 
-IF(NOT WikiExamples_BINARY_DIR)
-FIND_PACKAGE(VTK REQUIRED)
-IF(NOT VTK_USE_RENDERING)
-  MESSAGE(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
-ENDIF(NOT VTK_USE_RENDERING)
-INCLUDE(${VTK_USE_FILE})
-ENDIF(NOT WikiExamples_BINARY_DIR)
+if(NOT WikiExamples_BINARY_DIR)
+find_package(VTK REQUIRED)
+if(NOT VTK_USE_RENDERING)
+  message(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
+endif(NOT VTK_USE_RENDERING)
+include(${VTK_USE_FILE})
+endif(NOT WikiExamples_BINARY_DIR)
 
 if("${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" LESS 5.8)
-  SET(KIT_LIBS vtkRendering vtkHybrid)
+  set(KIT_LIBS vtkRendering vtkHybrid)
 else()
-  SET(KIT_LIBS ${VTK_LIBRARIES})
+  set(KIT_LIBS ${VTK_LIBRARIES})
 endif()
 #
 
-ADD_EXECUTABLE(AlgorithmFilter AlgorithmFilter vtkTestAlgorithmFilter vtkTest)
-TARGET_LINK_LIBRARIES(AlgorithmFilter ${VTK_LIBRARIES})
+add_executable(AlgorithmFilter AlgorithmFilter vtkTestAlgorithmFilter vtkTest)
+target_link_libraries(AlgorithmFilter ${VTK_LIBRARIES})
 
-ADD_EXECUTABLE(AlgorithmSource AlgorithmSource vtkTestAlgorithmSource vtkTest1)
-TARGET_LINK_LIBRARIES(AlgorithmSource ${VTK_LIBRARIES})
+add_executable(AlgorithmSource AlgorithmSource vtkTestAlgorithmSource vtkTest1)
+target_link_libraries(AlgorithmSource ${VTK_LIBRARIES})
 
-ADD_EXECUTABLE(ProgressReport ProgressReport.cxx vtkTestProgressReportFilter.cxx)
-TARGET_LINK_LIBRARIES(ProgressReport ${VTK_LIBRARIES})
+add_executable(ProgressReport ProgressReport.cxx vtkTestProgressReportFilter.cxx)
+target_link_libraries(ProgressReport ${VTK_LIBRARIES})
 
-ADD_EXECUTABLE(FilterSelfProgress FilterSelfProgress.cxx vtkTestFilterSelfProgressFilter.cxx)
-TARGET_LINK_LIBRARIES(FilterSelfProgress ${VTK_LIBRARIES})
+add_executable(FilterSelfProgress FilterSelfProgress.cxx vtkTestFilterSelfProgressFilter.cxx)
+target_link_libraries(FilterSelfProgress ${VTK_LIBRARIES})
 
-ADD_EXECUTABLE(GraphAlgorithmFilter GraphAlgorithmFilter vtkTestGraphAlgorithmFilter.cxx)
-TARGET_LINK_LIBRARIES(GraphAlgorithmFilter ${VTK_LIBRARIES})
+add_executable(GraphAlgorithmFilter GraphAlgorithmFilter vtkTestGraphAlgorithmFilter.cxx)
+target_link_libraries(GraphAlgorithmFilter ${VTK_LIBRARIES})
 
-ADD_EXECUTABLE(GraphAlgorithmSource GraphAlgorithmSource vtkTestGraphAlgorithmSource.cxx)
-TARGET_LINK_LIBRARIES(GraphAlgorithmSource ${VTK_LIBRARIES})
+add_executable(GraphAlgorithmSource GraphAlgorithmSource vtkTestGraphAlgorithmSource.cxx)
+target_link_libraries(GraphAlgorithmSource ${VTK_LIBRARIES})
 
-ADD_EXECUTABLE(ImageAlgorithmFilter ImageAlgorithmFilter vtkImageAlgorithmFilter.cxx)
-TARGET_LINK_LIBRARIES(ImageAlgorithmFilter ${VTK_LIBRARIES})
+add_executable(ImageAlgorithmFilter ImageAlgorithmFilter vtkImageAlgorithmFilter.cxx)
+target_link_libraries(ImageAlgorithmFilter ${VTK_LIBRARIES})
 
-ADD_EXECUTABLE(MultipleInputPorts MultipleInputPorts vtkTestMultipleInputPortsFilter)
-TARGET_LINK_LIBRARIES(MultipleInputPorts ${VTK_LIBRARIES})
+add_executable(MultipleInputPorts MultipleInputPorts vtkTestMultipleInputPortsFilter)
+target_link_libraries(MultipleInputPorts ${VTK_LIBRARIES})
diff --git a/src/Cxx/Filtering/CMakeLists.txt b/src/Cxx/Filtering/CMakeLists.txt
index cd9f95d2da2..9b92be29639 100644
--- a/src/Cxx/Filtering/CMakeLists.txt
+++ b/src/Cxx/Filtering/CMakeLists.txt
@@ -1,21 +1,21 @@
-PROJECT (${WIKI}Filtering)
+project (${WIKI}Filtering)
 
-IF(NOT WikiExamples_BINARY_DIR)
-FIND_PACKAGE(VTK REQUIRED)
-IF(NOT VTK_USE_RENDERING)
-  MESSAGE(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
-ENDIF(NOT VTK_USE_RENDERING)
-INCLUDE(${VTK_USE_FILE})
-ENDIF(NOT WikiExamples_BINARY_DIR)
+if(NOT WikiExamples_BINARY_DIR)
+find_package(VTK REQUIRED)
+if(NOT VTK_USE_RENDERING)
+  message(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
+endif(NOT VTK_USE_RENDERING)
+include(${VTK_USE_FILE})
+endif(NOT WikiExamples_BINARY_DIR)
 
 if("${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" LESS 5.8)
-  SET(KIT_LIBS vtkRendering vtkHybrid)
+  set(KIT_LIBS vtkRendering vtkHybrid)
 else()
-  SET(KIT_LIBS ${VTK_LIBRARIES})
+  set(KIT_LIBS ${VTK_LIBRARIES})
 endif()
 #
 # Build all .cxx files in the directory
-FILE(GLOB ALL_FILES *.cxx)
+file(GLOB ALL_FILES *.cxx)
 
 include(${WikiExamples_SOURCE_DIR}/CMake/RequiresVersion.cmake)
 include(${WikiExamples_SOURCE_DIR}/CMake/RequiresModule.cmake)
@@ -27,16 +27,16 @@ Requires_Setting_On (GenericClip BUILD_TESTING)
 
 
 foreach(SOURCE_FILE ${ALL_FILES})
-  STRING(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
-  STRING(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
-  ADD_EXECUTABLE(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
-  TARGET_LINK_LIBRARIES(${WIKI}${EXAMPLE} ${KIT_LIBS})
+  string(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
+  string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
+  add_executable(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
+  target_link_libraries(${WIKI}${EXAMPLE} ${KIT_LIBS})
 endforeach(SOURCE_FILE)
 
 if (BUILD_TESTING)
 # Testing
-SET(KIT Filtering)
-SET(NEEDS_ARGS
+set(KIT Filtering)
+set(NEEDS_ARGS
   ConstrainedDelaunay2D
   ContoursFromPolyData
   ConstrainedDelaunay2D
@@ -44,18 +44,18 @@ SET(NEEDS_ARGS
   SurfaceFromUnorganizedPoints
 )
 
-SET(DATA ${WikiExamples_SOURCE_DIR}/src/Testing/Data)
-ADD_TEST(${KIT}-ConstrainedDelaunay2D ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+set(DATA ${WikiExamples_SOURCE_DIR}/src/Testing/Data)
+add_test(${KIT}-ConstrainedDelaunay2D ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestConstrainedDelaunay2D -E 30)
 
-ADD_TEST(${KIT}-Delaunay2D ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-Delaunay2D ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestDelaunay2D -E 30)
 
-ADD_TEST(${KIT}-SurfaceFromUnorganizedPoints ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-SurfaceFromUnorganizedPoints ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestSurfaceFromUnorganizedPoints ${DATA}/Bunny.vtp -E 30)
 
-ADD_TEST(${KIT}-ContoursFromPolyData ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ContoursFromPolyData ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestContoursFromPolyData ${DATA}/Bunny.vtp  -E 30)
-INCLUDE(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
+include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
 
 endif()
diff --git a/src/Cxx/GeometricObjects/CMakeLists.txt b/src/Cxx/GeometricObjects/CMakeLists.txt
index adfbfd376a1..e8f9917da74 100644
--- a/src/Cxx/GeometricObjects/CMakeLists.txt
+++ b/src/Cxx/GeometricObjects/CMakeLists.txt
@@ -1,21 +1,21 @@
-PROJECT (${WIKI}GeometricObjects)
+project (${WIKI}GeometricObjects)
 
-IF(NOT WikiExamples_BINARY_DIR)
-FIND_PACKAGE(VTK REQUIRED)
-IF(NOT VTK_USE_RENDERING)
-  MESSAGE(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
-ENDIF(NOT VTK_USE_RENDERING)
-INCLUDE(${VTK_USE_FILE})
-ENDIF(NOT WikiExamples_BINARY_DIR)
+if(NOT WikiExamples_BINARY_DIR)
+find_package(VTK REQUIRED)
+if(NOT VTK_USE_RENDERING)
+  message(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
+endif(NOT VTK_USE_RENDERING)
+include(${VTK_USE_FILE})
+endif(NOT WikiExamples_BINARY_DIR)
 
 if("${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" LESS 5.8)
-  SET(KIT_LIBS vtkRendering vtkHybrid vtkWidgets)
+  set(KIT_LIBS vtkRendering vtkHybrid vtkWidgets)
 else()
-  SET(KIT_LIBS ${VTK_LIBRARIES})
+  set(KIT_LIBS ${VTK_LIBRARIES})
 endif()
 #
 # Build all .cxx files in the directory
-FILE(GLOB ALL_FILES *.cxx)
+file(GLOB ALL_FILES *.cxx)
 
 include(${WikiExamples_SOURCE_DIR}/CMake/RequiresVersion.cmake)
 set(VERSION_MIN "7.0")
@@ -23,25 +23,25 @@ Requires_Version(ParametricKuenDemo ${VERSION_MIN} ALL_FILES)
 Requires_Version(ParametricObjectsDemo2 ${VERSION_MIN} ALL_FILES)
 
 foreach(SOURCE_FILE ${ALL_FILES})
-  STRING(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
-  STRING(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
-  ADD_EXECUTABLE(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
-  TARGET_LINK_LIBRARIES(${WIKI}${EXAMPLE} ${KIT_LIBS})
+  string(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
+  string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
+  add_executable(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
+  target_link_libraries(${WIKI}${EXAMPLE} ${KIT_LIBS})
 endforeach(SOURCE_FILE)
 
 if (BUILD_TESTING)
 # Testing
-SET(KIT GeometricObjects)
-SET(NEEDS_ARGS
+set(KIT GeometricObjects)
+set(NEEDS_ARGS
     QuadraticHexahedron
     TessellatedBoxSource 
 )
 
-ADD_TEST(${KIT}-QuadraticHexahedron ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-QuadraticHexahedron ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestQuadraticHexahedron -E 30)
 
-ADD_TEST(${KIT}-TessellatedBoxSource ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-TessellatedBoxSource ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestTessellatedBoxSource -E 30)
 
-INCLUDE(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
+include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
 endif()
diff --git a/src/Cxx/Geovis/CMakeLists.txt b/src/Cxx/Geovis/CMakeLists.txt
index 29f421d8bcb..d9cc2147857 100644
--- a/src/Cxx/Geovis/CMakeLists.txt
+++ b/src/Cxx/Geovis/CMakeLists.txt
@@ -1,32 +1,32 @@
-PROJECT (${WIKI}Geovis)
+project (${WIKI}Geovis)
 
-IF(NOT WikiExamples_BINARY_DIR)
-FIND_PACKAGE(VTK REQUIRED)
-IF(NOT VTK_USE_RENDERING)
-  MESSAGE(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
-ENDIF(NOT VTK_USE_RENDERING)
-INCLUDE(${VTK_USE_FILE})
-ENDIF(NOT WikiExamples_BINARY_DIR)
+if(NOT WikiExamples_BINARY_DIR)
+find_package(VTK REQUIRED)
+if(NOT VTK_USE_RENDERING)
+  message(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
+endif(NOT VTK_USE_RENDERING)
+include(${VTK_USE_FILE})
+endif(NOT WikiExamples_BINARY_DIR)
 
 if("${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" LESS 5.8)
-  SET(KIT_LIBS vtkHybrid vtkGeovis)
+  set(KIT_LIBS vtkHybrid vtkGeovis)
 else()
-  SET(KIT_LIBS ${VTK_LIBRARIES})
+  set(KIT_LIBS ${VTK_LIBRARIES})
 endif()
 #
 # Build all .cxx files in the directory
-FILE(GLOB ALL_FILES *.cxx)
+file(GLOB ALL_FILES *.cxx)
 foreach(SOURCE_FILE ${ALL_FILES})
-  STRING(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
-  STRING(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
-  ADD_EXECUTABLE(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
-  TARGET_LINK_LIBRARIES(${WIKI}${EXAMPLE} ${KIT_LIBS})
+  string(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
+  string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
+  add_executable(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
+  target_link_libraries(${WIKI}${EXAMPLE} ${KIT_LIBS})
 endforeach(SOURCE_FILE)
 
 if (BUILD_TESTING)
 # Testing
-SET(KIT Geovis)
-SET(NEEDS_ARGS
+set(KIT Geovis)
+set(NEEDS_ARGS
 )
-INCLUDE(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
+include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
 endif()
diff --git a/src/Cxx/Graphs/CMakeLists.txt b/src/Cxx/Graphs/CMakeLists.txt
index af95afe80a1..211ad466c5b 100644
--- a/src/Cxx/Graphs/CMakeLists.txt
+++ b/src/Cxx/Graphs/CMakeLists.txt
@@ -1,30 +1,30 @@
-PROJECT (${WIKI}Graphs)
+project (${WIKI}Graphs)
 
-IF(NOT WikiExamples_BINARY_DIR)
-FIND_PACKAGE(VTK REQUIRED)
-IF(NOT VTK_USE_RENDERING)
-  MESSAGE(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
-ENDIF(NOT VTK_USE_RENDERING)
-INCLUDE(${VTK_USE_FILE})
-ENDIF(NOT WikiExamples_BINARY_DIR)
+if(NOT WikiExamples_BINARY_DIR)
+find_package(VTK REQUIRED)
+if(NOT VTK_USE_RENDERING)
+  message(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
+endif(NOT VTK_USE_RENDERING)
+include(${VTK_USE_FILE})
+endif(NOT WikiExamples_BINARY_DIR)
 
 if("${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" LESS 5.8)
-  SET(KIT_LIBS vtkViews vtkHybrid)
+  set(KIT_LIBS vtkViews vtkHybrid)
 else()
-  SET(KIT_LIBS ${VTK_LIBRARIES})
+  set(KIT_LIBS ${VTK_LIBRARIES})
 endif()
 #
 # Build all .cxx files in the directory
-FILE(GLOB ALL_FILES *.cxx)
+file(GLOB ALL_FILES *.cxx)
 foreach(SOURCE_FILE ${ALL_FILES})
-  STRING(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
-  STRING(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
-  ADD_EXECUTABLE(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
-  TARGET_LINK_LIBRARIES(${WIKI}${EXAMPLE} ${KIT_LIBS})
+  string(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
+  string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
+  add_executable(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
+  target_link_libraries(${WIKI}${EXAMPLE} ${KIT_LIBS})
 endforeach(SOURCE_FILE)
 
 # Testing
-SET(KIT Graphs)
-SET(NEEDS_ARGS
+set(KIT Graphs)
+set(NEEDS_ARGS
 )
-INCLUDE(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
+include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
diff --git a/src/Cxx/HyperTreeGrid/CMakeLists.txt b/src/Cxx/HyperTreeGrid/CMakeLists.txt
index 104fa204bd0..4af3090f5dd 100644
--- a/src/Cxx/HyperTreeGrid/CMakeLists.txt
+++ b/src/Cxx/HyperTreeGrid/CMakeLists.txt
@@ -1,18 +1,18 @@
-PROJECT (${WIKI}HyperTreeGrid)
+project (${WIKI}HyperTreeGrid)
 
-IF(NOT WikiExamples_BINARY_DIR)
-FIND_PACKAGE(VTK REQUIRED)
-IF(NOT VTK_USE_RENDERING)
-  MESSAGE(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
-ENDIF(NOT VTK_USE_RENDERING)
-INCLUDE(${VTK_USE_FILE})
-ENDIF(NOT WikiExamples_BINARY_DIR)
+if(NOT WikiExamples_BINARY_DIR)
+find_package(VTK REQUIRED)
+if(NOT VTK_USE_RENDERING)
+  message(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
+endif(NOT VTK_USE_RENDERING)
+include(${VTK_USE_FILE})
+endif(NOT WikiExamples_BINARY_DIR)
 
-SET(KIT_LIBS ${VTK_LIBRARIES})
+set(KIT_LIBS ${VTK_LIBRARIES})
 
 #
 # Build all .cxx files in the directory
-FILE(GLOB ALL_FILES *.cxx)
+file(GLOB ALL_FILES *.cxx)
 
 include(${WikiExamples_SOURCE_DIR}/CMake/RequiresVersion.cmake)
 set(VERSION_MIN "7.0")
@@ -20,17 +20,17 @@ Requires_Version(ParametricKuenDemo ${VERSION_MIN} ALL_FILES)
 Requires_Version(ParametricObjectsDemo2 ${VERSION_MIN} ALL_FILES)
 
 foreach(SOURCE_FILE ${ALL_FILES})
-  STRING(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
-  STRING(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
-  ADD_EXECUTABLE(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
-  TARGET_LINK_LIBRARIES(${WIKI}${EXAMPLE} ${KIT_LIBS})
+  string(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
+  string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
+  add_executable(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
+  target_link_libraries(${WIKI}${EXAMPLE} ${KIT_LIBS})
 endforeach(SOURCE_FILE)
 
 if (BUILD_TESTING)
 # Testing
-SET(KIT HyperTreeGrid)
-SET(NEEDS_ARGS
+set(KIT HyperTreeGrid)
+set(NEEDS_ARGS
 )
 
-INCLUDE(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
+include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
 endif()
diff --git a/src/Cxx/IO/CMakeLists.txt b/src/Cxx/IO/CMakeLists.txt
index fd75c794bdf..20a0cfcfbcb 100644
--- a/src/Cxx/IO/CMakeLists.txt
+++ b/src/Cxx/IO/CMakeLists.txt
@@ -1,32 +1,32 @@
-PROJECT (${WIKI}IO)
+project (${WIKI}IO)
 
-IF(NOT WikiExamples_BINARY_DIR)
-FIND_PACKAGE(VTK REQUIRED)
-IF(NOT VTK_USE_RENDERING)
-  MESSAGE(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
-ENDIF(NOT VTK_USE_RENDERING)
-INCLUDE(${VTK_USE_FILE})
-ENDIF(NOT WikiExamples_BINARY_DIR)
+if(NOT WikiExamples_BINARY_DIR)
+find_package(VTK REQUIRED)
+if(NOT VTK_USE_RENDERING)
+  message(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
+endif(NOT VTK_USE_RENDERING)
+include(${VTK_USE_FILE})
+endif(NOT WikiExamples_BINARY_DIR)
 
 if("${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" LESS 5.8)
-  SET(KIT_LIBS vtkHybrid vtkGenericFiltering)
+  set(KIT_LIBS vtkHybrid vtkGenericFiltering)
 else()
-  SET(KIT_LIBS ${VTK_LIBRARIES})
+  set(KIT_LIBS ${VTK_LIBRARIES})
 endif()
 #
 # Build all .cxx files in the directory
-FILE(GLOB ALL_FILES *.cxx)
+file(GLOB ALL_FILES *.cxx)
 foreach(SOURCE_FILE ${ALL_FILES})
-  STRING(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
-  STRING(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
-  ADD_EXECUTABLE(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
-  TARGET_LINK_LIBRARIES(${WIKI}${EXAMPLE} ${KIT_LIBS})
+  string(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
+  string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
+  add_executable(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
+  target_link_libraries(${WIKI}${EXAMPLE} ${KIT_LIBS})
 endforeach(SOURCE_FILE)
 
 if (BUILD_TESTING)
 # Testing
-SET(KIT IO)
-SET(NEEDS_ARGS
+set(KIT IO)
+set(NEEDS_ARGS
   3DSImporter
   ConvertFile
   DEMReader
@@ -75,147 +75,147 @@ SET(NEEDS_ARGS
   WriteVTU
 )
  
-SET(DATA ${WikiExamples_SOURCE_DIR}/src/Testing/Data)
-SET(TEMP ${WikiExamples_BINARY_DIR}/Testing/Temporary)
+set(DATA ${WikiExamples_SOURCE_DIR}/src/Testing/Data)
+set(TEMP ${WikiExamples_BINARY_DIR}/Testing/Temporary)
 
-ADD_TEST(${KIT}-3DSImporter ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-3DSImporter ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   Test3DSImporter ${DATA}/iflamingo.3ds)
 
-ADD_TEST(${KIT}-ConvertFile ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ConvertFile ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestConvertFile ${DATA}/Bunny.vtp ${TEMP}/ConvertFile.ply)
 
-ADD_TEST(${KIT}-DumpXMLFile ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-DumpXMLFile ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestDumpXMLFile ${DATA}/Bunny.vtp)
 
-ADD_TEST(${KIT}-GenericDataObjectReader ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-GenericDataObjectReader ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestGenericDataObjectReader ${DATA}/Bunny.vtp)
 
-ADD_TEST(${KIT}-IndividualVRML ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-IndividualVRML ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestIndividualVRML ${DATA}/teapot.wrl teapot)
 
-ADD_TEST(${KIT}-ImageReader2Factory ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ImageReader2Factory ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestImageReader2Factory ${DATA}/Gourds.png)
 
-ADD_TEST(${KIT}-JPEGReader ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-JPEGReader ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestJPEGReader ${DATA}/Pileated.jpg)
 
-ADD_TEST(${KIT}-JPEGWriter ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-JPEGWriter ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestJPEGWriter ${TEMP}/JPEGWriter.jpg)
 
-ADD_TEST(${KIT}-MetaImageReader ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-MetaImageReader ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestMetaImageReader ${DATA}/Gourds.mha)
 
-ADD_TEST(${KIT}-OBJImporter ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-OBJImporter ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestOBJImporter ${DATA}/doorman/doorman.obj ${DATA}/doorman/doorman.mtl ${DATA}/doorman)
 
-ADD_TEST(${KIT}-ParticleReader ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ParticleReader ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestParticleReader ${DATA}/Particles.raw)
 
-ADD_TEST(${KIT}-PNGReader ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-PNGReader ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestPNGReader ${DATA}/Gourds.png)
 
-ADD_TEST(${KIT}-PNGWriter ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-PNGWriter ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestPNGWriter ${TEMP}/PNGWriter.png)
 
-ADD_TEST(${KIT}-ReadAllPolyDataTypes ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ReadAllPolyDataTypes ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestReadAllPolyDataTypes ${DATA}/horse.ply)
 
-ADD_TEST(${KIT}-ReadAllPolyDataTypesDemo ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ReadAllPolyDataTypesDemo ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
     TestReadAllPolyDataTypesDemo ${DATA}/teapot.g ${DATA}/cowHead.vtp ${DATA}/horse.ply ${DATA}/trumpet.obj ${DATA}/42400-IDGH.stl ${DATA}/v.vtk)
 
-ADD_TEST(${KIT}-ReadBMP ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ReadBMP ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestReadBMP ${DATA}/masonry.bmp)
 
-ADD_TEST(${KIT}-DEMReader ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-DEMReader ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestDEMReader ${DATA}/SainteHelens.dem)
 
-ADD_TEST(${KIT}-ReadDICOM ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ReadDICOM ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestReadDICOM ${DATA}/prostate.img)
 
-ADD_TEST(${KIT}-ReadDICOMSeries ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ReadDICOMSeries ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestReadDICOMSeries ${DATA}/DICOMDirectory)
 
-ADD_TEST(${KIT}-ReadImageData ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ReadImageData ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestReadImageData ${DATA}/vase.vti)
 
-ADD_TEST(${KIT}-ReadOBJ ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ReadOBJ ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestReadOBJ ${DATA}/trumpet.obj)
 
-ADD_TEST(${KIT}-ReadPDB ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ReadPDB ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestReadPDB ${DATA}/lys.pdb)
 
-ADD_TEST(${KIT}-ReadPLOT3D ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ReadPLOT3D ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestReadPLOT3D ${DATA}/combxyz.bin ${DATA}/combq.bin)
 
-ADD_TEST(${KIT}-ReadPLY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ReadPLY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestReadPLY ${DATA}/shark.ply)
 
-ADD_TEST(${KIT}-ReadPolyData ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ReadPolyData ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestReadPolyData ${DATA}/Torso.vtp)
 
-ADD_TEST(${KIT}-ReadPNM ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ReadPNM ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestReadPNM ${DATA}/Gourds.pnm)
 
-ADD_TEST(${KIT}-ReadRectilinearGrid ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ReadRectilinearGrid ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestReadRectilinearGrid ${DATA}/RectilinearGrid.vtr)
 
-ADD_TEST(${KIT}-ReadSTL ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ReadSTL ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestReadSTL ${DATA}/42400-IDGH.stl)
 
-ADD_TEST(${KIT}-ReadStructuredGrid ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ReadStructuredGrid ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestReadStructuredGrid ${DATA}/StructuredGrid.vts)
 
-ADD_TEST(${KIT}-ReadPlainTextTriangles ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ReadPlainTextTriangles ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestReadPlainTextTriangles ${DATA}/Triangles.txt)
 
-ADD_TEST(${KIT}-ReadUnknownTypeXMLFile ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ReadUnknownTypeXMLFile ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestReadUnknownTypeXMLFile ${DATA}/Bunny.vtp)
 
-ADD_TEST(${KIT}-ReadTIFF ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ReadTIFF ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestReadTIFF ${DATA}/ColorCells.tif)
 
-ADD_TEST(${KIT}-ReadTextFile ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ReadTextFile ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestReadTextFile ${DATA}/TeapotPoints.txt)
 
-ADD_TEST(${KIT}-ReadUnstructuredGrid ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ReadUnstructuredGrid ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestReadUnstructuredGrid ${DATA}/tetra.vtu)
 
-ADD_TEST(${KIT}-SimplePointsReader ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-SimplePointsReader ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestSimplePointsReader ${DATA}/coords.txt)
 
-ADD_TEST(${KIT}-StructuredPointsReader ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-StructuredPointsReader ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestStructuredPointsReader ${DATA}/StructuredPoints.vtk)
 
-ADD_TEST(${KIT}-StructuredGridReader ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-StructuredGridReader ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestStructuredGridReader ${DATA}/SampleStructGrid.vtk)
 
-ADD_TEST(${KIT}-VRMLImporter ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-VRMLImporter ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestVRMLImporter ${DATA}/sextant.wrl -E 30)
 
-ADD_TEST(${KIT}-VRMLImporterDemo ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-VRMLImporterDemo ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestVRMLImporterDemo ${DATA}/grasshop.wrl)
 
-ADD_TEST(${KIT}-WriteBMP ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-WriteBMP ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestWriteBMP ${TEMP}/WriteBMP.bmp)
 
-ADD_TEST(${KIT}-WritePNM ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-WritePNM ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestWritePNM ${TEMP}/WritePNM.pnm)
 
-ADD_TEST(${KIT}-WritePLY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-WritePLY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestWritePLY ${TEMP}/WritePLY.ply)
 
-ADD_TEST(${KIT}-WriteSTL ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-WriteSTL ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestWriteSTL ${TEMP}/WriteSTL.stl)
 
-ADD_TEST(${KIT}-WriteTIFF ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-WriteTIFF ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestWriteTIFF ${TEMP}/WriteTIFF.tif)
 
-ADD_TEST(${KIT}-WriteVTI ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-WriteVTI ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestWriteVTI ${TEMP}/WriteVTI.vti)
 
-ADD_TEST(${KIT}-WriteVTU ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-WriteVTU ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestWriteVTU ${TEMP}/WriteVTU.vtu)
 
-INCLUDE(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
+include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
 
 endif()
diff --git a/src/Cxx/ImageData/CMakeLists.txt b/src/Cxx/ImageData/CMakeLists.txt
index 286a83876d7..73970eeb6fb 100644
--- a/src/Cxx/ImageData/CMakeLists.txt
+++ b/src/Cxx/ImageData/CMakeLists.txt
@@ -1,42 +1,42 @@
-PROJECT (${WIKI}ImageData)
+project (${WIKI}ImageData)
 
-IF(NOT WikiExamples_BINARY_DIR)
-FIND_PACKAGE(VTK REQUIRED)
-IF(NOT VTK_USE_RENDERING)
-  MESSAGE(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
-ENDIF(NOT VTK_USE_RENDERING)
-INCLUDE(${VTK_USE_FILE})
-ENDIF(NOT WikiExamples_BINARY_DIR)
+if(NOT WikiExamples_BINARY_DIR)
+find_package(VTK REQUIRED)
+if(NOT VTK_USE_RENDERING)
+  message(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
+endif(NOT VTK_USE_RENDERING)
+include(${VTK_USE_FILE})
+endif(NOT WikiExamples_BINARY_DIR)
 
 if("${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" LESS 5.8)
-  SET(KIT_LIBS vtkFiltering vtkHybrid)
+  set(KIT_LIBS vtkFiltering vtkHybrid)
 else()
-  SET(KIT_LIBS ${VTK_LIBRARIES})
+  set(KIT_LIBS ${VTK_LIBRARIES})
 endif()
 #
 # Build all .cxx files in the directory
-FILE(GLOB ALL_FILES *.cxx)
+file(GLOB ALL_FILES *.cxx)
 foreach(SOURCE_FILE ${ALL_FILES})
-  STRING(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
-  STRING(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
-  ADD_EXECUTABLE(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
-  TARGET_LINK_LIBRARIES(${WIKI}${EXAMPLE} ${KIT_LIBS})
+  string(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
+  string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
+  add_executable(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
+  target_link_libraries(${WIKI}${EXAMPLE} ${KIT_LIBS})
 endforeach(SOURCE_FILE)
 
 if (BUILD_TESTING)
 # Testing
-SET(KIT ImageData)
-SET(NEEDS_ARGS
+set(KIT ImageData)
+set(NEEDS_ARGS
   ExtractVOI
   ImageNormalize
 )
 
-ADD_TEST(${KIT}-ExtractVOI ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ExtractVOI ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestExtractVOI -E 50)
 
-ADD_TEST(${KIT}-ImageNormalize ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ImageNormalize ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestImageNormalize -E 35)
 
-INCLUDE(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
+include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
 
 endif()
diff --git a/src/Cxx/Images/CMakeLists.txt b/src/Cxx/Images/CMakeLists.txt
index 61971995cb2..b6fbd94a931 100644
--- a/src/Cxx/Images/CMakeLists.txt
+++ b/src/Cxx/Images/CMakeLists.txt
@@ -1,23 +1,23 @@
-PROJECT (${WIKI}Images)
+project (${WIKI}Images)
 
-IF(NOT WikiExamples_BINARY_DIR)
-FIND_PACKAGE(VTK REQUIRED)
-IF(NOT VTK_USE_RENDERING)
-  MESSAGE(FATAL_ERROR "VTKWikiExamples: Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
-ENDIF(NOT VTK_USE_RENDERING)
-INCLUDE(${VTK_USE_FILE})
-ENDIF(NOT WikiExamples_BINARY_DIR)
+if(NOT WikiExamples_BINARY_DIR)
+find_package(VTK REQUIRED)
+if(NOT VTK_USE_RENDERING)
+  message(FATAL_ERROR "VTKWikiExamples: Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
+endif(NOT VTK_USE_RENDERING)
+include(${VTK_USE_FILE})
+endif(NOT WikiExamples_BINARY_DIR)
 
-SET(KIT Images)
+set(KIT Images)
 if("${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" LESS 5.8)
-  SET(KIT_LIBS vtkHybrid vtkRendering vtkWidgets)
+  set(KIT_LIBS vtkHybrid vtkRendering vtkWidgets)
 else()
-  SET(KIT_LIBS ${VTK_LIBRARIES})
+  set(KIT_LIBS ${VTK_LIBRARIES})
 endif()
 
 #
 # Build all .cxx files in the directory
-FILE(GLOB ALL_FILES *.cxx)
+file(GLOB ALL_FILES *.cxx)
 
 if(NOT VTK_USE_SYSTEM_FREETYPE)
   message(STATUS "VTKWikiExamples: ImageText requires VTK_USE_SYSTEM_FREETYPE and will not be built")
@@ -26,15 +26,15 @@ if(NOT VTK_USE_SYSTEM_FREETYPE)
 endif()
 
 foreach(SOURCE_FILE ${ALL_FILES})
-  STRING(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
-  STRING(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
-  ADD_EXECUTABLE(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
-  TARGET_LINK_LIBRARIES(${WIKI}${EXAMPLE} ${KIT_LIBS})
+  string(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
+  string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
+  add_executable(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
+  target_link_libraries(${WIKI}${EXAMPLE} ${KIT_LIBS})
 endforeach(SOURCE_FILE)
 
 if (BUILD_TESTING)
 # Testing
-SET(NEEDS_ARGS
+set(NEEDS_ARGS
 #  HistogramBarChart
 #  HistogramXYPlot
   CannyEdgeDetector
@@ -75,129 +75,129 @@ SET(NEEDS_ARGS
   StaticImage
 )
 
-SET(DATA ${WikiExamples_SOURCE_DIR}/src/Testing/Data)
-SET(TEMP ${WikiExamples_BINARY_DIR}/Testing/Temporary)
+set(DATA ${WikiExamples_SOURCE_DIR}/src/Testing/Data)
+set(TEMP ${WikiExamples_BINARY_DIR}/Testing/Temporary)
 
-ADD_TEST(${KIT}-CannyEdgeDetector ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-CannyEdgeDetector ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestCannyEdgeDetector ${DATA}/Gourds.png)
 
-ADD_TEST(${KIT}-Cast ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-Cast ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestCast  ${DATA}/Ox.jpg ${TEMP}/Cast.jpg)
 
-ADD_TEST(${KIT}-CenterAnImage ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-CenterAnImage ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestCenterAnImage  ${DATA}/Ox.jpg)
 
-ADD_TEST(${KIT}-Colored2DImageFusion ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-Colored2DImageFusion ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestColored2DImageFusion  ${DATA}/Ox.jpg ${DATA}/Gourds2.jpg)
 
-ADD_TEST(${KIT}-CombineImages ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-CombineImages ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestCombineImages  ${DATA}/Ox.jpg ${DATA}/Gourds2.jpg)
 
-ADD_TEST(${KIT}-DrawOnAnImage ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-DrawOnAnImage ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestDrawOnAnImage  ${DATA}/Gourds2.jpg)
 
-ADD_TEST(${KIT}-ExtractComponents ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ExtractComponents ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestExtractComponents  ${DATA}/Gourds2.jpg)
 
-ADD_TEST(${KIT}-Flip ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-Flip ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestFlip  ${DATA}/Gourds2.jpg ${TEMP}/Flip.jpg )
 
-#ADD_TEST(${KIT}-HistogramBarChart ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+#add_test(${KIT}-HistogramBarChart ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
 #  TestHistogramBarChart ${DATA}/Gourds2.jpg)
 
-#ADD_TEST(${KIT}-HistogramXYPlot ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+#add_test(${KIT}-HistogramXYPlot ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
 #  TestHistogramXYPlot  ${DATA}/Gourds2.jpg)
 
-ADD_TEST(${KIT}-ImageAccumulateGreyscale ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ImageAccumulateGreyscale ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestImageAccumulateGreyscale  ${DATA}/Ox.jpg)
 
-ADD_TEST(${KIT}-ImageAnisotropicDiffusion2D ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ImageAnisotropicDiffusion2D ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestImageAnisotropicDiffusion2D  ${DATA}/cake_easy.jpg)
 
-ADD_TEST(${KIT}-ImageCheckerboard ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ImageCheckerboard ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestImageCheckerboard  ${DATA}/Ox.jpg ${DATA}/Gourds2.jpg)
 
-ADD_TEST(${KIT}-ImageCityBlockDistance ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ImageCityBlockDistance ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestImageCityBlockDistance ${DATA}/Yinyang.jpg -E 15)
 
-ADD_TEST(${KIT}-ImageContinuousDilate3D ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ImageContinuousDilate3D ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestImageContinuousDilate3D ${DATA}/Gourds.png)
 
-ADD_TEST(${KIT}-ImageContinuousErode3D ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ImageContinuousErode3D ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestImageContinuousErode3D ${DATA}/Gourds.png)
 
-ADD_TEST(${KIT}-ImageDilateErode3D ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ImageDilateErode3D ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestImageDilateErode3D ${DATA}/Yinyang.png -E 25)
 
-ADD_TEST(${KIT}-ImageHistogram ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ImageHistogram ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestImageHistogram ${DATA}/Pileated.jpg)
 
-ADD_TEST(${KIT}-ImageHybridMedian2D ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ImageHybridMedian2D ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestImageHybridMedian2D ${DATA}/Gourds.png)
 
-ADD_TEST(${KIT}-ImageMagnify ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ImageMagnify ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestImageMagnify ${DATA}/Gourds.png)
 
 # The ImageNoiseSource is inherently random
-ADD_TEST(${KIT}-ImageNoiseSource ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ImageNoiseSource ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestImageNoiseSource -E 999999)
 
-ADD_TEST(${KIT}-ImageNonMaximumSuppression ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ImageNonMaximumSuppression ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestImageNonMaximumSuppression -E 20)
 
-ADD_TEST(${KIT}-ImageOpenClose3D ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ImageOpenClose3D ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestImageOpenClose3D ${DATA}/Yinyang.png -E 25)
 
-ADD_TEST(${KIT}-InteractWithImage ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-InteractWithImage ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestInteractWithImage ${DATA}/Ox.jpg)
 
-ADD_TEST(${KIT}-ImageToPolyDataFilter ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ImageToPolyDataFilter ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestImageToPolyDataFilter ${DATA}/Gourds.png)
 
-ADD_TEST(${KIT}-ImageRotate ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ImageRotate ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestImageRotate ${DATA}/Gourds.png 45)
 
-ADD_TEST(${KIT}-ImageSeparableConvolution ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ImageSeparableConvolution ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestImageSeparableConvolution ${DATA}/Yinyang.png -E 25)
   
-ADD_TEST(${KIT}-ImageToStructuredPoints ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ImageToStructuredPoints ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestImageToStructuredPoints -E 25)
 
-ADD_TEST(${KIT}-Transparency ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-Transparency ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestTransparency  ${DATA}/Ox.jpg)
 
-ADD_TEST(${KIT}-PickPixel ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-PickPixel ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestPickPixel  ${DATA}/Gourds2.jpg)
 
-ADD_TEST(${KIT}-PickPixel2 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-PickPixel2 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestPickPixel2  ${DATA}/ColorCells.tif)
 
-ADD_TEST(${KIT}-ImageRange3D ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ImageRange3D ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestImageRange3D  ${DATA}/Gourds2.jpg)
 
-ADD_TEST(${KIT}-RGBToHSI ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-RGBToHSI ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestRGBToHSI ${DATA}/Gourds2.jpg)
 
-ADD_TEST(${KIT}-RGBToHSV ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-RGBToHSV ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestRGBToHSV ${DATA}/Gourds2.jpg)
 
-ADD_TEST(${KIT}-RGBToYIQ ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-RGBToYIQ ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestRGBToYIQ ${DATA}/Gourds2.jpg)
 
-ADD_TEST(${KIT}-StaticImage ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-StaticImage ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestStaticImage ${DATA}/Ox.jpg)
 
-ADD_TEST(${KIT}-Transparency ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-Transparency ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestTransparency ${DATA}/Gourds2.jpg)
 
-ADD_TEST(${KIT}-RTAnalyticSource ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-RTAnalyticSource ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestRTAnalyticSource -E 20)
 
-ADD_TEST(${KIT}-ResizeImage ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ResizeImage ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestResizeImage ${DATA}/Gourds2.jpg 1280 1024 5)
 
-ADD_TEST(${KIT}-ResizeImageDemo ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ResizeImageDemo ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestResizeImageDemo ${DATA}/Pileated.jpg 3)
 
-INCLUDE(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
+include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
 endif()
diff --git a/src/Cxx/ImplicitFunctions/CMakeLists.txt b/src/Cxx/ImplicitFunctions/CMakeLists.txt
index b9354db3107..eec8fbcf723 100644
--- a/src/Cxx/ImplicitFunctions/CMakeLists.txt
+++ b/src/Cxx/ImplicitFunctions/CMakeLists.txt
@@ -1,37 +1,37 @@
-PROJECT (${WIKI}ImplicitFunctions)
+project (${WIKI}ImplicitFunctions)
 
-IF(NOT WikiExamples_BINARY_DIR)
-FIND_PACKAGE(VTK REQUIRED)
-IF(NOT VTK_USE_RENDERING)
-  MESSAGE(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
-ENDIF(NOT VTK_USE_RENDERING)
-INCLUDE(${VTK_USE_FILE})
-ENDIF(NOT WikiExamples_BINARY_DIR)
+if(NOT WikiExamples_BINARY_DIR)
+find_package(VTK REQUIRED)
+if(NOT VTK_USE_RENDERING)
+  message(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
+endif(NOT VTK_USE_RENDERING)
+include(${VTK_USE_FILE})
+endif(NOT WikiExamples_BINARY_DIR)
 
 if("${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" LESS 5.8)
-  SET(KIT_LIBS vtkHybrid vtkWidgets)
+  set(KIT_LIBS vtkHybrid vtkWidgets)
 else()
-  SET(KIT_LIBS ${VTK_LIBRARIES})
+  set(KIT_LIBS ${VTK_LIBRARIES})
 endif()
 #
 # Build all .cxx files in the directory
-FILE(GLOB ALL_FILES *.cxx)
+file(GLOB ALL_FILES *.cxx)
 foreach(SOURCE_FILE ${ALL_FILES})
-  STRING(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
-  STRING(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
-  ADD_EXECUTABLE(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
-  TARGET_LINK_LIBRARIES(${WIKI}${EXAMPLE} ${KIT_LIBS})
+  string(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
+  string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
+  add_executable(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
+  target_link_libraries(${WIKI}${EXAMPLE} ${KIT_LIBS})
 endforeach(SOURCE_FILE)
 
 if (BUILD_TESTING)
 # Testing
-SET(KIT ImplicitFunctions)
-SET(NEEDS_ARGS
+set(KIT ImplicitFunctions)
+set(NEEDS_ARGS
     SampleFunction
 )
 
-ADD_TEST(${KIT}-SampleFunction ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-SampleFunction ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestSampleFunction -E 30)
 
-INCLUDE(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
+include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
 endif()
diff --git a/src/Cxx/InfoVis/CMakeLists.txt b/src/Cxx/InfoVis/CMakeLists.txt
index 973e728cdfc..1d5b7c81fc1 100644
--- a/src/Cxx/InfoVis/CMakeLists.txt
+++ b/src/Cxx/InfoVis/CMakeLists.txt
@@ -1,21 +1,21 @@
-PROJECT (${WIKI}InfoVis)
+project (${WIKI}InfoVis)
 
-IF(NOT WikiExamples_BINARY_DIR)
-FIND_PACKAGE(VTK REQUIRED)
-IF(NOT VTK_USE_INFOVIS)
-  MESSAGE(FATAL_ERROR "VTKWikiExamples: Example ${PROJECT_NAME} requires VTK_USE_INFOVIS.")
-ENDIF(NOT VTK_USE_INFOVIS)
-INCLUDE(${VTK_USE_FILE})
-ENDIF(NOT WikiExamples_BINARY_DIR)
+if(NOT WikiExamples_BINARY_DIR)
+find_package(VTK REQUIRED)
+if(NOT VTK_USE_INFOVIS)
+  message(FATAL_ERROR "VTKWikiExamples: Example ${PROJECT_NAME} requires VTK_USE_INFOVIS.")
+endif(NOT VTK_USE_INFOVIS)
+include(${VTK_USE_FILE})
+endif(NOT WikiExamples_BINARY_DIR)
 
 if("${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" LESS 5.8)
-  SET(KIT_LIBS vtkWidgets vtkRendering vtkHybrid vtkViews vtkInfovis)
+  set(KIT_LIBS vtkWidgets vtkRendering vtkHybrid vtkViews vtkInfovis)
 else()
-  SET(KIT_LIBS ${VTK_LIBRARIES})
+  set(KIT_LIBS ${VTK_LIBRARIES})
 endif()
 #
 # Build all .cxx files in the directory
-FILE(GLOB ALL_FILES *.cxx)
+file(GLOB ALL_FILES *.cxx)
 
 include(${WikiExamples_SOURCE_DIR}/CMake/RequiresModule.cmake)
 include(${WikiExamples_SOURCE_DIR}/CMake/RequiresSettingOn.cmake)
@@ -33,40 +33,40 @@ if(NOT VTK_USE_PARALLEL)
 endif()
 
 foreach(SOURCE_FILE ${ALL_FILES})
-  STRING(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
-  STRING(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
-  ADD_EXECUTABLE(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
-  TARGET_LINK_LIBRARIES(${WIKI}${EXAMPLE} ${KIT_LIBS})
+  string(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
+  string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
+  add_executable(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
+  target_link_libraries(${WIKI}${EXAMPLE} ${KIT_LIBS})
 endforeach(SOURCE_FILE)
 
 if (BUILD_TESTING)
 # Testing
-SET(KIT InfoVis)
+set(KIT InfoVis)
 
-SET(DATA ${WikiExamples_SOURCE_DIR}/src/Testing/Data)
+set(DATA ${WikiExamples_SOURCE_DIR}/src/Testing/Data)
 
-SET(NEEDS_ARGS
+set(NEEDS_ARGS
   DelimitedTextReader
   DelimitedTextWriter
   XGMLReader
 )
 if ("${ALL_FILES}" MATCHES ".*TreeMapView.*")
-  SET(NEEDS_ARGS "${NEEDS_ARGS};TreeMapView")
-  ADD_TEST(${KIT}-TreeMapView ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+  set(NEEDS_ARGS "${NEEDS_ARGS};TreeMapView")
+  add_test(${KIT}-TreeMapView ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
     TestTreeMapView ${DATA}/Infovis-XML-vtkclasses.xml ${DATA}/Infovis-XML-vtklibrary.xml)
 endif()
 
-SET(TEMP ${WikiExamples_BINARY_DIR}/Testing/Temporary)
+set(TEMP ${WikiExamples_BINARY_DIR}/Testing/Temporary)
 
-ADD_TEST(${KIT}-DelimitedTextReader ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-DelimitedTextReader ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestDelimitedTextReader ${DATA}/DelimitedData.txt)
 
-ADD_TEST(${KIT}-DelimitedTextWriter ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-DelimitedTextWriter ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestDelimitedTextWriter ${TEMP}/foo.txt)
 
-ADD_TEST(${KIT}-XGMLReader ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-XGMLReader ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestXGMLReader ${DATA}/fsm.gml)
 
-INCLUDE(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
+include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
 
 endif()
diff --git a/src/Cxx/Interaction/CMakeLists.txt b/src/Cxx/Interaction/CMakeLists.txt
index 51dfb6fba12..63ca4c3bb8c 100644
--- a/src/Cxx/Interaction/CMakeLists.txt
+++ b/src/Cxx/Interaction/CMakeLists.txt
@@ -1,47 +1,47 @@
-PROJECT (${WIKI}Interaction)
+project (${WIKI}Interaction)
 
-IF(NOT WikiExamples_BINARY_DIR)
-FIND_PACKAGE(VTK REQUIRED)
-IF(NOT VTK_USE_RENDERING)
-  MESSAGE(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
-ENDIF(NOT VTK_USE_RENDERING)
-INCLUDE(${VTK_USE_FILE})
-ENDIF(NOT WikiExamples_BINARY_DIR)
+if(NOT WikiExamples_BINARY_DIR)
+find_package(VTK REQUIRED)
+if(NOT VTK_USE_RENDERING)
+  message(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
+endif(NOT VTK_USE_RENDERING)
+include(${VTK_USE_FILE})
+endif(NOT WikiExamples_BINARY_DIR)
 
 if("${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" LESS 5.8)
-  SET(KIT_LIBS vtkRendering vtkWidgets vtkHybrid)
+  set(KIT_LIBS vtkRendering vtkWidgets vtkHybrid)
 else()
-  SET(KIT_LIBS ${VTK_LIBRARIES})
+  set(KIT_LIBS ${VTK_LIBRARIES})
 endif()
 #
 # Build all .cxx files in the directory
-FILE(GLOB ALL_FILES *.cxx)
+file(GLOB ALL_FILES *.cxx)
 foreach(SOURCE_FILE ${ALL_FILES})
-  STRING(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
-  STRING(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
-  ADD_EXECUTABLE(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
-  TARGET_LINK_LIBRARIES(${WIKI}${EXAMPLE} ${KIT_LIBS})
+  string(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
+  string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
+  add_executable(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
+  target_link_libraries(${WIKI}${EXAMPLE} ${KIT_LIBS})
 endforeach(SOURCE_FILE)
 
 if (BUILD_TESTING)
 # Testing
-SET(KIT Interaction)
-SET(NEEDS_ARGS
+set(KIT Interaction)
+set(NEEDS_ARGS
   EllipticalButton
   ImageClip
   ImageRegion
 )
-SET(DATA ${WikiExamples_SOURCE_DIR}/src/Testing/Data)
+set(DATA ${WikiExamples_SOURCE_DIR}/src/Testing/Data)
 
-ADD_TEST(${KIT}-EllipticalButton ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-EllipticalButton ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestEllipticalButton ${DATA}/Yinyang.png)
 
-ADD_TEST(${KIT}-ImageClip ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ImageClip ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestImageClip ${DATA}/Gourds2.jpg)
 
-ADD_TEST(${KIT}-ImageRegion ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ImageRegion ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestImageRegion ${DATA}/Gourds2.jpg)
 
-INCLUDE(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
+include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
 
 endif()
diff --git a/src/Cxx/Lighting/CMakeLists.txt b/src/Cxx/Lighting/CMakeLists.txt
index 90096bd427c..63b92ed7261 100644
--- a/src/Cxx/Lighting/CMakeLists.txt
+++ b/src/Cxx/Lighting/CMakeLists.txt
@@ -1,29 +1,29 @@
-PROJECT (${WIKI}Lighting)
+project (${WIKI}Lighting)
 
-IF(NOT WikiExamples_BINARY_DIR)
-FIND_PACKAGE(VTK REQUIRED)
-INCLUDE(${VTK_USE_FILE})
-ENDIF(NOT WikiExamples_BINARY_DIR)
+if(NOT WikiExamples_BINARY_DIR)
+find_package(VTK REQUIRED)
+include(${VTK_USE_FILE})
+endif(NOT WikiExamples_BINARY_DIR)
 
 if("${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" LESS 5.8)
-  SET(KIT_LIBS vtkHybrid)
+  set(KIT_LIBS vtkHybrid)
 else()
-  SET(KIT_LIBS ${VTK_LIBRARIES})
+  set(KIT_LIBS ${VTK_LIBRARIES})
 endif()
 #
 # Build all .cxx files in the directory
-FILE(GLOB ALL_FILES *.cxx)
+file(GLOB ALL_FILES *.cxx)
 foreach(SOURCE_FILE ${ALL_FILES})
-  STRING(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
-  STRING(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
-  ADD_EXECUTABLE(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
-  TARGET_LINK_LIBRARIES(${WIKI}${EXAMPLE} ${KIT_LIBS})
+  string(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
+  string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
+  add_executable(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
+  target_link_libraries(${WIKI}${EXAMPLE} ${KIT_LIBS})
 endforeach(SOURCE_FILE)
 
 if (BUILD_TESTING)
 # Testing
-SET(KIT Lighting)
-SET(NEEDS_ARGS
+set(KIT Lighting)
+set(NEEDS_ARGS
 )
-INCLUDE(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
+include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
 endif()
diff --git a/src/Cxx/Math/CMakeLists.txt b/src/Cxx/Math/CMakeLists.txt
index 183df3d484a..7a57d9872a2 100644
--- a/src/Cxx/Math/CMakeLists.txt
+++ b/src/Cxx/Math/CMakeLists.txt
@@ -1,29 +1,29 @@
-PROJECT (${WIKI}Math)
+project (${WIKI}Math)
 
-IF(NOT WikiExamples_BINARY_DIR)
-FIND_PACKAGE(VTK REQUIRED)
-INCLUDE(${VTK_USE_FILE})
-ENDIF(NOT WikiExamples_BINARY_DIR)
+if(NOT WikiExamples_BINARY_DIR)
+find_package(VTK REQUIRED)
+include(${VTK_USE_FILE})
+endif(NOT WikiExamples_BINARY_DIR)
 
 if("${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" LESS 5.8)
-  SET(KIT_LIBS vtkHybrid)
+  set(KIT_LIBS vtkHybrid)
 else()
-  SET(KIT_LIBS ${VTK_LIBRARIES})
+  set(KIT_LIBS ${VTK_LIBRARIES})
 endif()
 #
 # Build all .cxx files in the directory
-FILE(GLOB ALL_FILES *.cxx)
+file(GLOB ALL_FILES *.cxx)
 foreach(SOURCE_FILE ${ALL_FILES})
-  STRING(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
-  STRING(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
-  ADD_EXECUTABLE(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
-  TARGET_LINK_LIBRARIES(${WIKI}${EXAMPLE} ${KIT_LIBS})
+  string(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
+  string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
+  add_executable(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
+  target_link_libraries(${WIKI}${EXAMPLE} ${KIT_LIBS})
 endforeach(SOURCE_FILE)
 
 if (BUILD_TESTING)
 # Testing
-SET(KIT Math)
-SET(NEEDS_ARGS
+set(KIT Math)
+set(NEEDS_ARGS
 )
-INCLUDE(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
+include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
 endif()
diff --git a/src/Cxx/Medical/CMakeLists.txt b/src/Cxx/Medical/CMakeLists.txt
index 9237a5c22a8..02a0bc078f3 100644
--- a/src/Cxx/Medical/CMakeLists.txt
+++ b/src/Cxx/Medical/CMakeLists.txt
@@ -1,32 +1,32 @@
-PROJECT (${WIKI}Medical)
+project (${WIKI}Medical)
 
-IF(NOT WikiExamples_BINARY_DIR)
-FIND_PACKAGE(VTK REQUIRED)
-IF(NOT VTK_USE_RENDERING)
-  MESSAGE(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
-ENDIF(NOT VTK_USE_RENDERING)
-INCLUDE(${VTK_USE_FILE})
-ENDIF(NOT WikiExamples_BINARY_DIR)
+if(NOT WikiExamples_BINARY_DIR)
+find_package(VTK REQUIRED)
+if(NOT VTK_USE_RENDERING)
+  message(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
+endif(NOT VTK_USE_RENDERING)
+include(${VTK_USE_FILE})
+endif(NOT WikiExamples_BINARY_DIR)
 
 if("${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" LESS 5.8)
-  SET(KIT_LIBS vtkFiltering vtkHybrid vtkVolumeRendering)
+  set(KIT_LIBS vtkFiltering vtkHybrid vtkVolumeRendering)
 else()
-  SET(KIT_LIBS ${VTK_LIBRARIES})
+  set(KIT_LIBS ${VTK_LIBRARIES})
 endif()
 #
 # Build all .cxx files in the directory
-FILE(GLOB ALL_FILES *.cxx)
+file(GLOB ALL_FILES *.cxx)
 foreach(SOURCE_FILE ${ALL_FILES})
-  STRING(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
-  STRING(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
-  ADD_EXECUTABLE(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
-  TARGET_LINK_LIBRARIES(${WIKI}${EXAMPLE} ${KIT_LIBS})
+  string(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
+  string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
+  add_executable(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
+  target_link_libraries(${WIKI}${EXAMPLE} ${KIT_LIBS})
 endforeach(SOURCE_FILE)
 
 if (BUILD_TESTING)
 # Testing
-SET(KIT Medical)
-SET(NEEDS_ARGS
+set(KIT Medical)
+set(NEEDS_ARGS
   GenerateCubesFromLabels
   GenerateModelsFromLabels
   MedicalDemo1
@@ -35,29 +35,29 @@ SET(NEEDS_ARGS
   MedicalDemo4
   TissueLens
 )
-SET(DATA ${WikiExamples_SOURCE_DIR}/src/Testing/Data)
+set(DATA ${WikiExamples_SOURCE_DIR}/src/Testing/Data)
 
-ADD_TEST(${KIT}-GenerateCubesFromLabels ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-GenerateCubesFromLabels ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestGenerateCubesFromLabels ${DATA}/frogtissue.mhd 1 29)
 
-ADD_TEST(${KIT}-GenerateModelsFromLabels ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-GenerateModelsFromLabels ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestGenerateModelsFromLabels ${DATA}/frogtissue.mhd 1 29)
 
-ADD_TEST(${KIT}-MedicalDemo1 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-MedicalDemo1 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestMedicalDemo1 ${DATA}/FullHead.mhd)
 
-ADD_TEST(${KIT}-MedicalDemo2 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-MedicalDemo2 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestMedicalDemo2 ${DATA}/FullHead.mhd)
 
-ADD_TEST(${KIT}-MedicalDemo3 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-MedicalDemo3 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestMedicalDemo3 ${DATA}/FullHead.mhd -E 30)
 
-ADD_TEST(${KIT}-MedicalDemo4 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-MedicalDemo4 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestMedicalDemo4 ${DATA}/FullHead.mhd)
 
-ADD_TEST(${KIT}-TissueLens ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-TissueLens ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestTissueLens ${DATA}/FullHead.mhd)
 
-INCLUDE(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
+include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
 
 endif()
diff --git a/src/Cxx/Meshes/CMakeLists.txt b/src/Cxx/Meshes/CMakeLists.txt
index 7efd8263cd7..50d207779cd 100644
--- a/src/Cxx/Meshes/CMakeLists.txt
+++ b/src/Cxx/Meshes/CMakeLists.txt
@@ -1,22 +1,22 @@
-PROJECT (${WIKI}Meshes)
+project (${WIKI}Meshes)
 
-IF(NOT WikiExamples_BINARY_DIR)
-FIND_PACKAGE(VTK REQUIRED)
-IF(NOT VTK_USE_RENDERING)
-  MESSAGE(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
-ENDIF(NOT VTK_USE_RENDERING)
-INCLUDE(${VTK_USE_FILE})
-ENDIF(NOT WikiExamples_BINARY_DIR)
+if(NOT WikiExamples_BINARY_DIR)
+find_package(VTK REQUIRED)
+if(NOT VTK_USE_RENDERING)
+  message(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
+endif(NOT VTK_USE_RENDERING)
+include(${VTK_USE_FILE})
+endif(NOT WikiExamples_BINARY_DIR)
 
 if("${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" LESS 5.8)
-  SET(KIT_LIBS vtkRendering vtkHybrid)
+  set(KIT_LIBS vtkRendering vtkHybrid)
 else()
-  SET(KIT_LIBS ${VTK_LIBRARIES})
+  set(KIT_LIBS ${VTK_LIBRARIES})
 endif()
 
 #
 # Build all .cxx files in the directory
-FILE(GLOB ALL_FILES *.cxx)
+file(GLOB ALL_FILES *.cxx)
 
 include(${WikiExamples_SOURCE_DIR}/CMake/RequiresVersion.cmake)
 include(${WikiExamples_SOURCE_DIR}/CMake/RequiresModule.cmake)
@@ -25,16 +25,16 @@ set(VERSION_MIN "6.0")
 Requires_Version(DeformPointSet ${VERSION_MIN} ALL_FILES)
 
 foreach(SOURCE_FILE ${ALL_FILES})
-  STRING(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
-  STRING(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
-  ADD_EXECUTABLE(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
-  TARGET_LINK_LIBRARIES(${WIKI}${EXAMPLE} ${KIT_LIBS})
+  string(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
+  string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
+  add_executable(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
+  target_link_libraries(${WIKI}${EXAMPLE} ${KIT_LIBS})
 endforeach(SOURCE_FILE)
 
 if (BUILD_TESTING)
 # Testing
-SET(KIT Meshes)
-SET(NEEDS_ARGS
+set(KIT Meshes)
+set(NEEDS_ARGS
   ClipFrustum
   ClipDataSetWithPolyData
   Decimation
@@ -47,40 +47,40 @@ SET(NEEDS_ARGS
   SplitPolyData
   TableBasedClipDataSetWithPolyData
 )
-SET(DATA ${WikiExamples_SOURCE_DIR}/src/Testing/Data)
+set(DATA ${WikiExamples_SOURCE_DIR}/src/Testing/Data)
 
-ADD_TEST(${KIT}-ClipFrustum ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ClipFrustum ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestClipFrustum ${DATA}/Armadillo.ply)
 
-ADD_TEST(${KIT}-Decimation ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-Decimation ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestDecimation ${DATA}/Torso.vtp)
 
-ADD_TEST(${KIT}-QuadricDecimation ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-QuadricDecimation ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestQuadricDecimation ${DATA}/Torso.vtp)
 
-ADD_TEST(${KIT}-QuadricClustering ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-QuadricClustering ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestQuadricClustering ${DATA}/Torso.vtp)
 
-ADD_TEST(${KIT}-ClipDataSetWithPolyData ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ClipDataSetWithPolyData ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestClipDataSetWithPolyData -E 25)
 
-ADD_TEST(${KIT}-FillHoles ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-FillHoles ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestFillHoles ${DATA}/Torso.vtp)
 
-ADD_TEST(${KIT}-IdentifyHoles ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-IdentifyHoles ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestIdentifyHoles ${DATA}/Torso.vtp)
 
-ADD_TEST(${KIT}-OBBDicer ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-OBBDicer ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestOBBDicer ${DATA}/Bunny.vtp)
 
-ADD_TEST(${KIT}-MatrixMathFilter ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-MatrixMathFilter ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestMatrixMathFilter ${DATA}/tensors.vtk)
 
-ADD_TEST(${KIT}-SplitPolyData ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-SplitPolyData ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestSplitPolyData ${DATA}/cowHead.vtp)
 
-ADD_TEST(${KIT}-TableBasedClipDataSetWithPolyData ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-TableBasedClipDataSetWithPolyData ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestTableBasedClipDataSetWithPolyData -E 25)
 
-INCLUDE(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
+include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
 endif()
diff --git a/src/Cxx/Modelling/CMakeLists.txt b/src/Cxx/Modelling/CMakeLists.txt
index b1dd0fd84ae..8bd375eb347 100644
--- a/src/Cxx/Modelling/CMakeLists.txt
+++ b/src/Cxx/Modelling/CMakeLists.txt
@@ -1,32 +1,32 @@
-PROJECT (${WIKI}Modelling)
+project (${WIKI}Modelling)
 
-IF(NOT WikiExamples_BINARY_DIR)
-FIND_PACKAGE(VTK REQUIRED)
-IF(NOT VTK_USE_RENDERING)
-  MESSAGE(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
-ENDIF(NOT VTK_USE_RENDERING)
-INCLUDE(${VTK_USE_FILE})
-ENDIF(NOT WikiExamples_BINARY_DIR)
+if(NOT WikiExamples_BINARY_DIR)
+find_package(VTK REQUIRED)
+if(NOT VTK_USE_RENDERING)
+  message(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
+endif(NOT VTK_USE_RENDERING)
+include(${VTK_USE_FILE})
+endif(NOT WikiExamples_BINARY_DIR)
 
 if("${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" LESS 5.8)
-  SET(KIT_LIBS  vtkHybrid)
+  set(KIT_LIBS  vtkHybrid)
 else()
-  SET(KIT_LIBS ${VTK_LIBRARIES})
+  set(KIT_LIBS ${VTK_LIBRARIES})
 endif()
 #
 # Build all .cxx files in the directory
-FILE(GLOB ALL_FILES *.cxx)
+file(GLOB ALL_FILES *.cxx)
 foreach(SOURCE_FILE ${ALL_FILES})
-  STRING(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
-  STRING(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
-  ADD_EXECUTABLE(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
-  TARGET_LINK_LIBRARIES(${WIKI}${EXAMPLE} ${KIT_LIBS})
+  string(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
+  string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
+  add_executable(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
+  target_link_libraries(${WIKI}${EXAMPLE} ${KIT_LIBS})
 endforeach(SOURCE_FILE)
 
 if (BUILD_TESTING)
 # Testing
-SET(KIT Modelling)
-SET(NEEDS_ARGS
+set(KIT Modelling)
+set(NEEDS_ARGS
   ContourTriangulator
   Delaunay3D
   Delaunay3DDemo
@@ -34,23 +34,23 @@ SET(NEEDS_ARGS
   MarchingSquares
 )
 
-SET(DATA ${WikiExamples_SOURCE_DIR}/src/Testing/Data)
-SET(TEMP ${WikiExamples_BINARY_DIR}/Testing/Temporary)
+set(DATA ${WikiExamples_SOURCE_DIR}/src/Testing/Data)
+set(TEMP ${WikiExamples_BINARY_DIR}/Testing/Temporary)
 
-ADD_TEST(${KIT}-Delaunay3D ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-Delaunay3D ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestDelaunay3D ${DATA}/Bunny.vtp)
 
-ADD_TEST(${KIT}-Delaunay3DDemo ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-Delaunay3DDemo ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestDelaunay3DDemo ${DATA}/Bunny.vtp)
 
-ADD_TEST(${KIT}-ExtractLargestIsosurface ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ExtractLargestIsosurface ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestExtractLargestIsosurface ${DATA}/brain.vtk 50 1)
 
-ADD_TEST(${KIT}-MarchingSquares ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-MarchingSquares ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestMarchingSquares ${DATA}/fullhead15.png 500)
 
-ADD_TEST(${KIT}-ContourTriangulator ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ContourTriangulator ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestContourTriangulator ${DATA}/fullhead15.png 500)
 
-INCLUDE(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
+include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
 endif()
diff --git a/src/Cxx/Parallel/CMakeLists.txt b/src/Cxx/Parallel/CMakeLists.txt
index 70dc4dcd1e1..4bf6873df15 100644
--- a/src/Cxx/Parallel/CMakeLists.txt
+++ b/src/Cxx/Parallel/CMakeLists.txt
@@ -1,35 +1,35 @@
-PROJECT (${WIKI}Parallel)
+project (${WIKI}Parallel)
 
-IF(NOT WikiExamples_BINARY_DIR)
-FIND_PACKAGE(VTK REQUIRED)
-IF(NOT VTK_USE_PARALLEL)
-  MESSAGE(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
-ENDIF(NOT VTK_USE_PARALLEL)
-INCLUDE(${VTK_USE_FILE})
-ENDIF(NOT WikiExamples_BINARY_DIR)
+if(NOT WikiExamples_BINARY_DIR)
+find_package(VTK REQUIRED)
+if(NOT VTK_USE_PARALLEL)
+  message(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
+endif(NOT VTK_USE_PARALLEL)
+include(${VTK_USE_FILE})
+endif(NOT WikiExamples_BINARY_DIR)
 
 if("${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" LESS 5.8)
-  SET(KIT_LIBS vtkHybrid vtkWidgets)
+  set(KIT_LIBS vtkHybrid vtkWidgets)
 else()
-  SET(KIT_LIBS ${VTK_LIBRARIES})
+  set(KIT_LIBS ${VTK_LIBRARIES})
 endif()
 #
 # Build all .cxx files in the directory
-FILE(GLOB ALL_FILES *.cxx)
+file(GLOB ALL_FILES *.cxx)
 foreach(SOURCE_FILE ${ALL_FILES})
-  STRING(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
-  STRING(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
-  ADD_EXECUTABLE(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
-  TARGET_LINK_LIBRARIES(${WIKI}${EXAMPLE} ${KIT_LIBS})
+  string(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
+  string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
+  add_executable(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
+  target_link_libraries(${WIKI}${EXAMPLE} ${KIT_LIBS})
 endforeach(SOURCE_FILE)
 
 # Testing
-SET(KIT Parallel)
-SET(NEEDS_ARGS
+set(KIT Parallel)
+set(NEEDS_ARGS
 
 )
-INCLUDE(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
+include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
 
-SET(DATA ${WikiExamples_SOURCE_DIR}/src/Testing/Data)
-SET(TEMP ${WikiExamples_BINARY_DIR}/Testing/Temporary)
+set(DATA ${WikiExamples_SOURCE_DIR}/src/Testing/Data)
+set(TEMP ${WikiExamples_BINARY_DIR}/Testing/Temporary)
 
diff --git a/src/Cxx/Picking/CMakeLists.txt b/src/Cxx/Picking/CMakeLists.txt
index 333884ae4e7..20ed601431b 100644
--- a/src/Cxx/Picking/CMakeLists.txt
+++ b/src/Cxx/Picking/CMakeLists.txt
@@ -1,32 +1,32 @@
-PROJECT (${WIKI}Picking)
+project (${WIKI}Picking)
 
-IF(NOT WikiExamples_BINARY_DIR)
-FIND_PACKAGE(VTK REQUIRED)
-IF(NOT VTK_USE_RENDERING)
-  MESSAGE(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
-ENDIF(NOT VTK_USE_RENDERING)
-INCLUDE(${VTK_USE_FILE})
-ENDIF(NOT WikiExamples_BINARY_DIR)
+if(NOT WikiExamples_BINARY_DIR)
+find_package(VTK REQUIRED)
+if(NOT VTK_USE_RENDERING)
+  message(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
+endif(NOT VTK_USE_RENDERING)
+include(${VTK_USE_FILE})
+endif(NOT WikiExamples_BINARY_DIR)
 
 if("${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" LESS 5.8)
-  SET(KIT_LIBS vtkRendering vtkHybrid)
+  set(KIT_LIBS vtkRendering vtkHybrid)
 else()
-  SET(KIT_LIBS ${VTK_LIBRARIES})
+  set(KIT_LIBS ${VTK_LIBRARIES})
 endif()
 #
 # Build all .cxx files in the directory
-FILE(GLOB ALL_FILES *.cxx)
+file(GLOB ALL_FILES *.cxx)
 foreach(SOURCE_FILE ${ALL_FILES})
-  STRING(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
-  STRING(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
-  ADD_EXECUTABLE(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
-  TARGET_LINK_LIBRARIES(${WIKI}${EXAMPLE} ${KIT_LIBS})
+  string(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
+  string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
+  add_executable(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
+  target_link_libraries(${WIKI}${EXAMPLE} ${KIT_LIBS})
 endforeach(SOURCE_FILE)
 
 if (BUILD_TESTING)
 # Testing
-SET(KIT Picking)
-SET(NEEDS_ARGS
+set(KIT Picking)
+set(NEEDS_ARGS
 )
-INCLUDE(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
+include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
 endif()
diff --git a/src/Cxx/Plotting/CMakeLists.txt b/src/Cxx/Plotting/CMakeLists.txt
index cbafe8cc46d..5f24f87eae0 100644
--- a/src/Cxx/Plotting/CMakeLists.txt
+++ b/src/Cxx/Plotting/CMakeLists.txt
@@ -1,21 +1,21 @@
-PROJECT (${WIKI}Plotting)
+project (${WIKI}Plotting)
 
-IF(NOT WikiExamples_BINARY_DIR)
-FIND_PACKAGE(VTK REQUIRED)
-IF(NOT VTK_USE_RENDERING)
-  MESSAGE(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
-ENDIF(NOT VTK_USE_RENDERING)
-INCLUDE(${VTK_USE_FILE})
-ENDIF(NOT WikiExamples_BINARY_DIR)
+if(NOT WikiExamples_BINARY_DIR)
+find_package(VTK REQUIRED)
+if(NOT VTK_USE_RENDERING)
+  message(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
+endif(NOT VTK_USE_RENDERING)
+include(${VTK_USE_FILE})
+endif(NOT WikiExamples_BINARY_DIR)
 
 if("${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" LESS 5.8)
-  SET(KIT_LIBS vtkHybrid vtkCharts)
+  set(KIT_LIBS vtkHybrid vtkCharts)
 else()
-  SET(KIT_LIBS ${VTK_LIBRARIES})
+  set(KIT_LIBS ${VTK_LIBRARIES})
 endif()
 #
 # Build all .cxx files in the directory
-FILE(GLOB ALL_FILES *.cxx)
+file(GLOB ALL_FILES *.cxx)
 
 include(${WikiExamples_SOURCE_DIR}/CMake/RequiresVersion.cmake)
 
@@ -25,20 +25,20 @@ Requires_Version(StackedPlot ${VERSION_MIN} ALL_FILES)
 Requires_Version(StackedBar ${VERSION_MIN} ALL_FILES)
 
 foreach(SOURCE_FILE ${ALL_FILES})
-  STRING(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
-  STRING(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
-  ADD_EXECUTABLE(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
-  TARGET_LINK_LIBRARIES(${WIKI}${EXAMPLE} ${KIT_LIBS})
+  string(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
+  string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
+  add_executable(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
+  target_link_libraries(${WIKI}${EXAMPLE} ${KIT_LIBS})
 endforeach(SOURCE_FILE)
 
 if (BUILD_TESTING)
 # Testing
-SET(KIT Plotting)
-SET(NEEDS_ARGS
+set(KIT Plotting)
+set(NEEDS_ARGS
     LinePlot
 )
-ADD_TEST(${KIT}-LinePlot ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-LinePlot ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestLinePlot -E 50)
 
-INCLUDE(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
+include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
 endif()
diff --git a/src/Cxx/Points/CMakeLists.txt b/src/Cxx/Points/CMakeLists.txt
index d3f845fbba8..98be887fd09 100644
--- a/src/Cxx/Points/CMakeLists.txt
+++ b/src/Cxx/Points/CMakeLists.txt
@@ -1,22 +1,22 @@
-PROJECT (${WIKI}Points)
+project (${WIKI}Points)
 
-IF(NOT WikiExamples_BINARY_DIR)
-FIND_PACKAGE(VTK REQUIRED)
-IF(NOT VTK_USE_RENDERING)
-  MESSAGE(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
-ENDIF(NOT VTK_USE_RENDERING)
-INCLUDE(${VTK_USE_FILE})
-ENDIF(NOT WikiExamples_BINARY_DIR)
+if(NOT WikiExamples_BINARY_DIR)
+find_package(VTK REQUIRED)
+if(NOT VTK_USE_RENDERING)
+  message(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
+endif(NOT VTK_USE_RENDERING)
+include(${VTK_USE_FILE})
+endif(NOT WikiExamples_BINARY_DIR)
 
 if("${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" LESS 5.8)
-  SET(KIT_LIBS vtkRendering vtkHybrid)
+  set(KIT_LIBS vtkRendering vtkHybrid)
 else()
-  SET(KIT_LIBS ${VTK_LIBRARIES})
+  set(KIT_LIBS ${VTK_LIBRARIES})
 endif()
 
 #
 # Build all .cxx files in the directory
-FILE(GLOB ALL_FILES *.cxx)
+file(GLOB ALL_FILES *.cxx)
 
 include(${WikiExamples_SOURCE_DIR}/CMake/RequiresVersion.cmake)
 include(${WikiExamples_SOURCE_DIR}/CMake/RequiresModule.cmake)
@@ -40,16 +40,16 @@ Requires_Module(CompareExtractSurface Powercrust)
 Requires_Module(CompareExtractSurface PoissonReconstruction)
 
 foreach(SOURCE_FILE ${ALL_FILES})
-  STRING(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
-  STRING(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
-  ADD_EXECUTABLE(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
-  TARGET_LINK_LIBRARIES(${WIKI}${EXAMPLE} ${KIT_LIBS})
+  string(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
+  string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
+  add_executable(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
+  target_link_libraries(${WIKI}${EXAMPLE} ${KIT_LIBS})
 endforeach(SOURCE_FILE)
 
 if (BUILD_TESTING)
 # Testing
-SET(KIT Points)
-SET(NEEDS_ARGS
+set(KIT Points)
+set(NEEDS_ARGS
   CompareExtractSurface
   ExtractSurface
   ExtractSurfaceDemo
@@ -60,29 +60,29 @@ SET(NEEDS_ARGS
   SignedDistance
   UnsignedDistance
 )
-SET(DATA ${WikiExamples_SOURCE_DIR}/src/Testing/Data)
+set(DATA ${WikiExamples_SOURCE_DIR}/src/Testing/Data)
 
 if(Powercrust_LOADED AND PoissonReconstruction_LOADED)
-  ADD_TEST(${KIT}-CompareExtractSurface ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+  add_test(${KIT}-CompareExtractSurface ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
      TestCompareExtractSurface ${DATA}/horsePoints.vtp)
 endif()
 
-ADD_TEST(${KIT}-ExtractSurface ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ExtractSurface ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
      TestExtractSurface ${DATA}/Armadillo.ply)
-ADD_TEST(${KIT}-ExtractSurfaceDemo ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ExtractSurfaceDemo ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
      TestExtractSurfaceDemo ${DATA}/Armadillo.ply)
-ADD_TEST(${KIT}-DensifyPoints ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-DensifyPoints ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
      TestDensifyPoints ${DATA}/Torso.vtp)
-ADD_TEST(${KIT}-MaskPointsFilter ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-MaskPointsFilter ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
      TestMaskPointsFilter ${DATA}/FullHead.mhd)
-ADD_TEST(${KIT}-PointOccupancy ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-PointOccupancy ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
      TestPointOccupancy ${DATA}/cowHead.vtp)
-ADD_TEST(${KIT}-RadiusOutlierRemoval ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-RadiusOutlierRemoval ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
      TestRadiusOutlierRemoval ${DATA}/cowHead.vtp)
-ADD_TEST(${KIT}-SignedDistance ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-SignedDistance ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
      TestSignedDistance ${DATA}/Armadillo.ply)
-ADD_TEST(${KIT}-UnsignedDistance ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-UnsignedDistance ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
      TestUnsignedDistance ${DATA}/Armadillo.ply)
 
-INCLUDE(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
+include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
 endif()
diff --git a/src/Cxx/PolyData/CMakeLists.txt b/src/Cxx/PolyData/CMakeLists.txt
index 436fa011430..22fd2e207f2 100644
--- a/src/Cxx/PolyData/CMakeLists.txt
+++ b/src/Cxx/PolyData/CMakeLists.txt
@@ -1,21 +1,21 @@
-PROJECT (${WIKI}PolyData)
+project (${WIKI}PolyData)
 
-IF(NOT WikiExamples_BINARY_DIR)
-FIND_PACKAGE(VTK REQUIRED)
-IF(NOT VTK_USE_RENDERING)
-  MESSAGE(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
-ENDIF(NOT VTK_USE_RENDERING)
-INCLUDE(${VTK_USE_FILE})
-ENDIF(NOT WikiExamples_BINARY_DIR)
+if(NOT WikiExamples_BINARY_DIR)
+find_package(VTK REQUIRED)
+if(NOT VTK_USE_RENDERING)
+  message(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
+endif(NOT VTK_USE_RENDERING)
+include(${VTK_USE_FILE})
+endif(NOT WikiExamples_BINARY_DIR)
 
 if("${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" LESS 5.8)
-  SET(KIT_LIBS vtkWidgets vtkHybrid vtkCharts)
+  set(KIT_LIBS vtkWidgets vtkHybrid vtkCharts)
 else()
-  SET(KIT_LIBS ${VTK_LIBRARIES})
+  set(KIT_LIBS ${VTK_LIBRARIES})
 endif()
 #
 # Build all .cxx files in the directory
-FILE(GLOB ALL_FILES *.cxx)
+file(GLOB ALL_FILES *.cxx)
 
 include(${WikiExamples_SOURCE_DIR}/CMake/RequiresVersion.cmake)
 
@@ -28,16 +28,16 @@ Requires_Version(IntersectionPolyDataFilter ${VERSION_MIN} ALL_FILES)
 Requires_Version(Curvatures "6.0.0" ALL_FILES)
 
 foreach(SOURCE_FILE ${ALL_FILES})
-  STRING(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
-  STRING(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
-  ADD_EXECUTABLE(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
-  TARGET_LINK_LIBRARIES(${WIKI}${EXAMPLE} ${KIT_LIBS})
+  string(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
+  string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
+  add_executable(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
+  target_link_libraries(${WIKI}${EXAMPLE} ${KIT_LIBS})
 endforeach(SOURCE_FILE)
 
 if (BUILD_TESTING)
 # Testing
-SET(KIT PolyData)
-SET(NEEDS_ARGS
+set(KIT PolyData)
+set(NEEDS_ARGS
   BooleanOperationPolyDataFilter
   LoopBooleanPolyDataFilter
   CellLocatorVisualization
@@ -70,92 +70,92 @@ if(NOT ${VTK_VERSION} VERSION_LESS "6")
   list(APPEND NEEDS_ARGS Curvatures)
 endif()
 
-SET(DATA ${WikiExamples_SOURCE_DIR}/src/Testing/Data)
-SET(TEMP ${WikiExamples_BINARY_DIR}/Testing/Temporary)
+set(DATA ${WikiExamples_SOURCE_DIR}/src/Testing/Data)
+set(TEMP ${WikiExamples_BINARY_DIR}/Testing/Temporary)
 
-ADD_TEST(${KIT}-BooleanOperationPolyDataFilter ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-BooleanOperationPolyDataFilter ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestBooleanOperationPolyDataFilter ${DATA}/Torso.vtp difference ${DATA}/ObliqueCone.vtp)
 
-ADD_TEST(${KIT}-LoopBooleanPolyDataFilter ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-LoopBooleanPolyDataFilter ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestLoopBooleanPolyDataFilter ${DATA}/Torso.vtp difference ${DATA}/ObliqueCone.vtp)
 
-ADD_TEST(${KIT}-CellLocatorVisualization ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-CellLocatorVisualization ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestCellLocatorVisualization -E 50)
 
-ADD_TEST(${KIT}-ColoredPoints ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ColoredPoints ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestColoredPoints ${TEMP}/coloredpoints.vtp)
 
-ADD_TEST(${KIT}-ConvexHull ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ConvexHull ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestConvexHull ${DATA}/cowHead.vtp)
 
 if(NOT ${VTK_VERSION} VERSION_LESS "6")
-  ADD_TEST(${KIT}-Curvatures ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+  add_test(${KIT}-Curvatures ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
     TestCurvatures ${DATA}/cowHead.vtp -20 20)
 endif()
 
-ADD_TEST(${KIT}-DijkstraGraphGeodesicPath ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-DijkstraGraphGeodesicPath ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestDijkstraGraphGeodesicPath	-E 20)
 
-ADD_TEST(${KIT}-EmbedPointsIntoVolume ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-EmbedPointsIntoVolume ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestEmbedPointsIntoVolume ${DATA}/Bunny.vtp )
 
-ADD_TEST(${KIT}-ExternalContour ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ExternalContour ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestExternalContour ${DATA}/Bunny.vtp -E 80 )
 
-ADD_TEST(${KIT}-DetermineArrayDataTypes ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-DetermineArrayDataTypes ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestDetermineArrayDataTypes ${DATA}/foilledContours.vtp)
 
-ADD_TEST(${KIT}-GetMiscCellData ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-GetMiscCellData ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestGetMiscCellData ${DATA}/SuperQuadric.vtp Nromals)
 
-ADD_TEST(${KIT}-GetMiscPointData ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-GetMiscPointData ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestGetMiscPointData ${DATA}/cowHead.vtp Gauss_Curvature)
 
-ADD_TEST(${KIT}-GradientFilter ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-GradientFilter ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestGradientFilter ${DATA}/uGridEx.vtk)
 
-ADD_TEST(${KIT}-GreedyTerrainDecimation ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-GreedyTerrainDecimation ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestGreedyTerrainDecimation -E 55)
 
-ADD_TEST(${KIT}-HighlightBadCells ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-HighlightBadCells ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestHighlightBadCells -E 20)
 
-ADD_TEST(${KIT}-ImplicitModeller ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ImplicitModeller ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestImplicitModeller ${DATA}/Bunny.vtp)
 
-ADD_TEST(${KIT}-MiscPointData ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-MiscPointData ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestMiscPointData ${DATA}/cowHead.vtp)
 
-ADD_TEST(${KIT}-PointLocatorVisualization ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-PointLocatorVisualization ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestPointLocatorVisualization -E 50)
 
-ADD_TEST(${KIT}-PolyDataIsoLines ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-PolyDataIsoLines ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestPolyDataIsoLines ${DATA}/cowHead.vtp)
 
-ADD_TEST(${KIT}-PolyDataPointSampler ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-PolyDataPointSampler ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestPolyDataPointSampler ${DATA}/Torso.vtp)
 
-ADD_TEST(${KIT}-RemoveVertices ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-RemoveVertices ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestRemoveVertices ${DATA}/Bunny.vtp)
 
-ADD_TEST(${KIT}-Silhouette ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-Silhouette ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestSilhouette ${DATA}/cowHead.vtp)
 
-ADD_TEST(${KIT}-ShrinkPolyData ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ShrinkPolyData ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestShrinkPolyData ${DATA}/cowHead.vtp -E 30)
 
-ADD_TEST(${KIT}-ThinPlateSplineTransform ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ThinPlateSplineTransform ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestThinPlateSplineTransform ${DATA}/masonry.bmp)
 
-ADD_TEST(${KIT}-TriangleColoredPoints ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-TriangleColoredPoints ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestTriangleColoredPoints -E 15)
 
-ADD_TEST(${KIT}-TriangleSolidColor ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-TriangleSolidColor ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestTriangleSolidColor -E 25)
 
-ADD_TEST(${KIT}-WarpSurface ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-WarpSurface ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestWarpSurface ${DATA}/cowHead.vtp .1)
 
-INCLUDE(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
+include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
 
 endif()
diff --git a/src/Cxx/Qt/CMakeLists.txt b/src/Cxx/Qt/CMakeLists.txt
index 47e938d4ab3..66d67680c27 100644
--- a/src/Cxx/Qt/CMakeLists.txt
+++ b/src/Cxx/Qt/CMakeLists.txt
@@ -13,31 +13,31 @@ foreach(p
 endforeach()
 #-----------------------------------------------------------------------------
 
-PROJECT (QtVTKWikiExamples)
+project (QtVTKWikiExamples)
 
-IF(NOT WikiExamples_BINARY_DIR)
-FIND_PACKAGE(VTK REQUIRED)
-IF(NOT VTK_USE_RENDERING)
-  MESSAGE(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
-ENDIF(NOT VTK_USE_RENDERING)
-INCLUDE(${VTK_USE_FILE})
-ENDIF(NOT WikiExamples_BINARY_DIR)
+if(NOT WikiExamples_BINARY_DIR)
+find_package(VTK REQUIRED)
+if(NOT VTK_USE_RENDERING)
+  message(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
+endif(NOT VTK_USE_RENDERING)
+include(${VTK_USE_FILE})
+endif(NOT WikiExamples_BINARY_DIR)
 
 if("${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" LESS 5.8)
-  SET(KIT_LIBS vtkHybrid ${QT_LIBRARIES} )
+  set(KIT_LIBS vtkHybrid ${QT_LIBRARIES} )
 else()
-  SET(KIT_LIBS ${VTK_LIBRARIES})
+  set(KIT_LIBS ${VTK_LIBRARIES})
 endif()
 
 # Let Qt find its MOCed headers in the build directory.
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 #
 # For all [example].ui files, build them together with their corresponding
 # [example]Driver.cxx and [example].cxx. Subtract these cxx files from a
 # list of all cxx files in the directory - we will build the rest in the next block.
-FILE(GLOB ALL_UI_FILES *.ui)
-FILE(GLOB ALL_FILES *.cxx)
+file(GLOB ALL_UI_FILES *.ui)
+file(GLOB ALL_FILES *.cxx)
 
 include(${WikiExamples_SOURCE_DIR}/CMake/RequiresModule.cmake)
 
@@ -49,9 +49,9 @@ Requires_Module(QImageToImageSource vtkRenderingQt)
 
 foreach(EXAMPLE_FILE ${ALL_UI_FILES})
 
-  STRING(REPLACE ".ui" "" TMP ${EXAMPLE_FILE})
+  string(REPLACE ".ui" "" TMP ${EXAMPLE_FILE})
 
-  STRING(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
+  string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
   set(UISrcs)
   set(MOCSrcs)
 
@@ -63,21 +63,21 @@ foreach(EXAMPLE_FILE ${ALL_UI_FILES})
   else()
     add_executable(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
   endif()
-  TARGET_LINK_LIBRARIES(${WIKI}${EXAMPLE} ${KIT_LIBS})
+  target_link_libraries(${WIKI}${EXAMPLE} ${KIT_LIBS})
   list(REMOVE_ITEM ALL_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${EXAMPLE}Driver.cxx ${CMAKE_CURRENT_SOURCE_DIR}/${EXAMPLE}.cxx)
 endforeach(EXAMPLE_FILE)
 
 # Build all remaining .cxx files.
 foreach(EXAMPLE_FILE ${ALL_FILES})
-  STRING(REPLACE ".cxx" "" TMP ${EXAMPLE_FILE})
-  STRING(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
+  string(REPLACE ".cxx" "" TMP ${EXAMPLE_FILE})
+  string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
 
   if(VTK_QT_VERSION VERSION_GREATER "4")
-    ADD_EXECUTABLE(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
+    add_executable(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
     qt5_use_modules(${WIKI}${EXAMPLE} Core Gui Widgets)
-    TARGET_LINK_LIBRARIES(${WIKI}${EXAMPLE} ${KIT_LIBS})
+    target_link_libraries(${WIKI}${EXAMPLE} ${KIT_LIBS})
   else()
-    ADD_EXECUTABLE(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
-    TARGET_LINK_LIBRARIES(${WIKI}${EXAMPLE} ${KIT_LIBS})
+    add_executable(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
+    target_link_libraries(${WIKI}${EXAMPLE} ${KIT_LIBS})
   endif()
 endforeach(EXAMPLE_FILE)
diff --git a/src/Cxx/RectilinearGrid/CMakeLists.txt b/src/Cxx/RectilinearGrid/CMakeLists.txt
index 00eb242452b..dd1f33b6989 100644
--- a/src/Cxx/RectilinearGrid/CMakeLists.txt
+++ b/src/Cxx/RectilinearGrid/CMakeLists.txt
@@ -1,30 +1,30 @@
-PROJECT (${WIKI}RectilinearGrid)
+project (${WIKI}RectilinearGrid)
 
-IF(NOT WikiExamples_BINARY_DIR)
-FIND_PACKAGE(VTK REQUIRED)
-IF(NOT VTK_USE_RENDERING)
-  MESSAGE(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
-ENDIF(NOT VTK_USE_RENDERING)
-INCLUDE(${VTK_USE_FILE})
-ENDIF(NOT WikiExamples_BINARY_DIR)
+if(NOT WikiExamples_BINARY_DIR)
+find_package(VTK REQUIRED)
+if(NOT VTK_USE_RENDERING)
+  message(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
+endif(NOT VTK_USE_RENDERING)
+include(${VTK_USE_FILE})
+endif(NOT WikiExamples_BINARY_DIR)
 
 if("${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" LESS 5.8)
-  SET(KIT_LIBS vtkHybrid)
+  set(KIT_LIBS vtkHybrid)
 else()
-  SET(KIT_LIBS ${VTK_LIBRARIES})
+  set(KIT_LIBS ${VTK_LIBRARIES})
 endif()
 #
 # Build all .cxx files in the directory
-FILE(GLOB ALL_FILES *.cxx)
+file(GLOB ALL_FILES *.cxx)
 foreach(SOURCE_FILE ${ALL_FILES})
-  STRING(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
-  STRING(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
-  ADD_EXECUTABLE(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
-  TARGET_LINK_LIBRARIES(${WIKI}${EXAMPLE} ${KIT_LIBS})
+  string(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
+  string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
+  add_executable(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
+  target_link_libraries(${WIKI}${EXAMPLE} ${KIT_LIBS})
 endforeach(SOURCE_FILE)
 
 if (BUILD_TESTING)
 # Testing
-SET(KIT RectilinearGrid)
-INCLUDE(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
+set(KIT RectilinearGrid)
+include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
 endif()
diff --git a/src/Cxx/Remote/CMakeLists.txt b/src/Cxx/Remote/CMakeLists.txt
index b7d18ecfd26..78bc1e57f9f 100644
--- a/src/Cxx/Remote/CMakeLists.txt
+++ b/src/Cxx/Remote/CMakeLists.txt
@@ -1,15 +1,15 @@
-PROJECT (${WIKI}Remote)
+project (${WIKI}Remote)
 
-IF(NOT WikiExamples_BINARY_DIR)
-  FIND_PACKAGE(VTK REQUIRED)
-  INCLUDE(${VTK_USE_FILE})
-ENDIF(NOT WikiExamples_BINARY_DIR)
+if(NOT WikiExamples_BINARY_DIR)
+  find_package(VTK REQUIRED)
+  include(${VTK_USE_FILE})
+endif(NOT WikiExamples_BINARY_DIR)
 
-SET(KIT_LIBS ${VTK_LIBRARIES})
+set(KIT_LIBS ${VTK_LIBRARIES})
 
 #
 # Build all .cxx files in the directory
-FILE(GLOB ALL_FILES *.cxx)
+file(GLOB ALL_FILES *.cxx)
 
 include(${WikiExamples_SOURCE_DIR}/CMake/RequiresModule.cmake)
 
@@ -17,16 +17,16 @@ Requires_Module(FrenetSerretFrame SplineDrivenImageSlicer)
 Requires_Module(FrenetSerretFrameDemo SplineDrivenImageSlicer)
 
 foreach(SOURCE_FILE ${ALL_FILES})
-  STRING(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
-  STRING(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
-  ADD_EXECUTABLE(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
-  TARGET_LINK_LIBRARIES(${WIKI}${EXAMPLE} ${KIT_LIBS})
+  string(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
+  string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
+  add_executable(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
+  target_link_libraries(${WIKI}${EXAMPLE} ${KIT_LIBS})
 endforeach(SOURCE_FILE)
 
 if (BUILD_TESTING)
 # Testing
-SET(KIT Remote)
-SET(DATA ${WikiExamples_SOURCE_DIR}/src/Testing/Data)
+set(KIT Remote)
+set(DATA ${WikiExamples_SOURCE_DIR}/src/Testing/Data)
 
-INCLUDE(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
+include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
 endif()
diff --git a/src/Cxx/RenderMan/CMakeLists.txt b/src/Cxx/RenderMan/CMakeLists.txt
index d1ebd4a9c54..fb61f80a99b 100644
--- a/src/Cxx/RenderMan/CMakeLists.txt
+++ b/src/Cxx/RenderMan/CMakeLists.txt
@@ -1,39 +1,39 @@
-PROJECT (${WIKI}RenderMan)
+project (${WIKI}RenderMan)
 
-IF(NOT WikiExamples_BINARY_DIR)
-FIND_PACKAGE(VTK REQUIRED)
-INCLUDE(${VTK_USE_FILE})
-ENDIF(NOT WikiExamples_BINARY_DIR)
+if(NOT WikiExamples_BINARY_DIR)
+find_package(VTK REQUIRED)
+include(${VTK_USE_FILE})
+endif(NOT WikiExamples_BINARY_DIR)
 
 if("${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" LESS 5.8)
-  SET(KIT_LIBS vtkRendering vtkHybrid)
+  set(KIT_LIBS vtkRendering vtkHybrid)
 else()
-  SET(KIT_LIBS ${VTK_LIBRARIES})
+  set(KIT_LIBS ${VTK_LIBRARIES})
 endif()
 #
 # Build all .cxx files in the directory
-FILE(GLOB ALL_FILES *.cxx)
+file(GLOB ALL_FILES *.cxx)
 include(${WikiExamples_SOURCE_DIR}/CMake/RequiresVersion.cmake)
 
 set(VERSION_MIN "6.0")
 Requires_Version(PolyDataRIB ${VERSION_MIN} ALL_FILES)
 
 foreach(SOURCE_FILE ${ALL_FILES})
-  STRING(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
-  STRING(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
-  ADD_EXECUTABLE(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
-  TARGET_LINK_LIBRARIES(${WIKI}${EXAMPLE} ${KIT_LIBS})
+  string(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
+  string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
+  add_executable(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
+  target_link_libraries(${WIKI}${EXAMPLE} ${KIT_LIBS})
 endforeach(SOURCE_FILE)
 
 if (BUILD_TESTING)
 # Testing
-SET(KIT RenderMan)
-SET(NEEDS_ARGS
+set(KIT RenderMan)
+set(NEEDS_ARGS
   PolyDataRIB
 )
-SET(DATA ${WikiExamples_SOURCE_DIR}/src/Testing/Data)
-ADD_TEST(${KIT}-PolyDataRIB ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+set(DATA ${WikiExamples_SOURCE_DIR}/src/Testing/Data)
+add_test(${KIT}-PolyDataRIB ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestPolyDataRIB ${DATA}/Torso.vtp .01)
 
-INCLUDE(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
+include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
 endif()
diff --git a/src/Cxx/Rendering/CMakeLists.txt b/src/Cxx/Rendering/CMakeLists.txt
index 88353e1c356..e3f323867bb 100644
--- a/src/Cxx/Rendering/CMakeLists.txt
+++ b/src/Cxx/Rendering/CMakeLists.txt
@@ -1,56 +1,56 @@
-PROJECT (${WIKI}Rendering)
+project (${WIKI}Rendering)
 
-IF(NOT WikiExamples_BINARY_DIR)
-FIND_PACKAGE(VTK REQUIRED)
-IF(NOT VTK_USE_RENDERING)
-  MESSAGE(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
-ENDIF(NOT VTK_USE_RENDERING)
-INCLUDE(${VTK_USE_FILE})
-ENDIF(NOT WikiExamples_BINARY_DIR)
+if(NOT WikiExamples_BINARY_DIR)
+find_package(VTK REQUIRED)
+if(NOT VTK_USE_RENDERING)
+  message(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
+endif(NOT VTK_USE_RENDERING)
+include(${VTK_USE_FILE})
+endif(NOT WikiExamples_BINARY_DIR)
 
 if("${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" LESS 5.8)
-  SET(KIT_LIBS vtkHybrid vtkWidgets)
+  set(KIT_LIBS vtkHybrid vtkWidgets)
 else()
-  SET(KIT_LIBS ${VTK_LIBRARIES})
+  set(KIT_LIBS ${VTK_LIBRARIES})
 endif()
 #
 # Build all .cxx files in the directory
-FILE(GLOB ALL_FILES *.cxx)
+file(GLOB ALL_FILES *.cxx)
 foreach(SOURCE_FILE ${ALL_FILES})
-  STRING(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
-  STRING(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
-  ADD_EXECUTABLE(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
-  TARGET_LINK_LIBRARIES(${WIKI}${EXAMPLE} ${KIT_LIBS})
+  string(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
+  string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
+  add_executable(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
+  target_link_libraries(${WIKI}${EXAMPLE} ${KIT_LIBS})
 endforeach(SOURCE_FILE)
 
 if (BUILD_TESTING)
 # Testing
-SET(KIT Rendering)
-SET(NEEDS_ARGS
+set(KIT Rendering)
+set(NEEDS_ARGS
   Rainbow
   Rotations
   WalkCow
   WalkCowA
   WalkCowB
 )
-SET(DATA ${WikiExamples_SOURCE_DIR}/src/Testing/Data)
-SET(TEMP ${WikiExamples_BINARY_DIR}/Testing/Temporary)
+set(DATA ${WikiExamples_SOURCE_DIR}/src/Testing/Data)
+set(TEMP ${WikiExamples_BINARY_DIR}/Testing/Temporary)
 
-ADD_TEST(${KIT}-Rotations ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-Rotations ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestRotations ${DATA}/cow.obj)
 
-ADD_TEST(${KIT}-Rainbow ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-Rainbow ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestRainbow ${DATA}/combxyz.bin ${DATA}/combq.bin)
 
-ADD_TEST(${KIT}-WalkCow ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-WalkCow ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestWalkCow ${DATA}/cow.g)
 
-ADD_TEST(${KIT}-WalkCowA ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-WalkCowA ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestWalkCowA ${DATA}/cow.g 1)
 
-ADD_TEST(${KIT}-WalkCowB ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-WalkCowB ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestWalkCowB ${DATA}/cow.g 2)
 
-INCLUDE(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
+include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
 
 endif()
diff --git a/src/Cxx/SimpleOperations/CMakeLists.txt b/src/Cxx/SimpleOperations/CMakeLists.txt
index d07d3df6e8e..f3843bdc4b2 100644
--- a/src/Cxx/SimpleOperations/CMakeLists.txt
+++ b/src/Cxx/SimpleOperations/CMakeLists.txt
@@ -1,38 +1,38 @@
-PROJECT (${WIKI}SimpleOperations)
+project (${WIKI}SimpleOperations)
 
-IF(NOT WikiExamples_BINARY_DIR)
-FIND_PACKAGE(VTK REQUIRED)
-IF(NOT VTK_USE_RENDERING)
-  MESSAGE(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
-ENDIF(NOT VTK_USE_RENDERING)
-INCLUDE(${VTK_USE_FILE})
-ENDIF(NOT WikiExamples_BINARY_DIR)
+if(NOT WikiExamples_BINARY_DIR)
+find_package(VTK REQUIRED)
+if(NOT VTK_USE_RENDERING)
+  message(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
+endif(NOT VTK_USE_RENDERING)
+include(${VTK_USE_FILE})
+endif(NOT WikiExamples_BINARY_DIR)
 
 if("${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" LESS 5.8)
-  SET(KIT_LIBS vtkRendering vtkHybrid)
+  set(KIT_LIBS vtkRendering vtkHybrid)
 else()
-  SET(KIT_LIBS ${VTK_LIBRARIES})
+  set(KIT_LIBS ${VTK_LIBRARIES})
 endif()
 #
 # Build all .cxx files in the directory
-FILE(GLOB ALL_FILES *.cxx)
+file(GLOB ALL_FILES *.cxx)
 foreach(SOURCE_FILE ${ALL_FILES})
-  STRING(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
-  STRING(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
-  ADD_EXECUTABLE(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
-  TARGET_LINK_LIBRARIES(${WIKI}${EXAMPLE} ${KIT_LIBS})
+  string(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
+  string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
+  add_executable(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
+  target_link_libraries(${WIKI}${EXAMPLE} ${KIT_LIBS})
 endforeach(SOURCE_FILE)
 
 if (BUILD_TESTING)
 
 # Testing
-SET(KIT SimpleOperations)
+set(KIT SimpleOperations)
 
-SET (EXCLUDE_TEST
+set (EXCLUDE_TEST
   FloatingPointExceptions
 )
 
-INCLUDE(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
+include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
 # set_tests_properties(
 #     SimpleOperations-FloatingPointExceptions
 #     PROPERTIES WILL_FAIL TRUE
diff --git a/src/Cxx/StructuredGrid/CMakeLists.txt b/src/Cxx/StructuredGrid/CMakeLists.txt
index 920ac089ebe..c2dafdd133d 100644
--- a/src/Cxx/StructuredGrid/CMakeLists.txt
+++ b/src/Cxx/StructuredGrid/CMakeLists.txt
@@ -1,32 +1,32 @@
-PROJECT (${WIKI}StructuredGrid)
+project (${WIKI}StructuredGrid)
 
-IF(NOT WikiExamples_BINARY_DIR)
-FIND_PACKAGE(VTK REQUIRED)
-IF(NOT VTK_USE_RENDERING)
-  MESSAGE(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
-ENDIF(NOT VTK_USE_RENDERING)
-INCLUDE(${VTK_USE_FILE})
-ENDIF(NOT WikiExamples_BINARY_DIR)
+if(NOT WikiExamples_BINARY_DIR)
+find_package(VTK REQUIRED)
+if(NOT VTK_USE_RENDERING)
+  message(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
+endif(NOT VTK_USE_RENDERING)
+include(${VTK_USE_FILE})
+endif(NOT WikiExamples_BINARY_DIR)
 
 if("${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" LESS 5.8)
-  SET(KIT_LIBS vtkHybrid)
+  set(KIT_LIBS vtkHybrid)
 else()
-  SET(KIT_LIBS ${VTK_LIBRARIES})
+  set(KIT_LIBS ${VTK_LIBRARIES})
 endif()
 #
 # Build all .cxx files in the directory
-FILE(GLOB ALL_FILES *.cxx)
+file(GLOB ALL_FILES *.cxx)
 foreach(SOURCE_FILE ${ALL_FILES})
-  STRING(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
-  STRING(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
-  ADD_EXECUTABLE(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
-  TARGET_LINK_LIBRARIES(${WIKI}${EXAMPLE} ${KIT_LIBS})
+  string(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
+  string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
+  add_executable(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
+  target_link_libraries(${WIKI}${EXAMPLE} ${KIT_LIBS})
 endforeach(SOURCE_FILE)
 
 if (BUILD_TESTING)
 # Testing
-SET(KIT StructuredGrid)
-SET(NEEDS_ARGS
+set(KIT StructuredGrid)
+set(NEEDS_ARGS
 )
-INCLUDE(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
+include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
 endif()
diff --git a/src/Cxx/StructuredPoints/CMakeLists.txt b/src/Cxx/StructuredPoints/CMakeLists.txt
index 23fae406b35..b05e1a32d0c 100644
--- a/src/Cxx/StructuredPoints/CMakeLists.txt
+++ b/src/Cxx/StructuredPoints/CMakeLists.txt
@@ -1,32 +1,32 @@
-PROJECT (${WIKI}StructuredPoints)
+project (${WIKI}StructuredPoints)
 
-IF(NOT WikiExamples_BINARY_DIR)
-FIND_PACKAGE(VTK REQUIRED)
-IF(NOT VTK_USE_RENDERING)
-  MESSAGE(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
-ENDIF(NOT VTK_USE_RENDERING)
-INCLUDE(${VTK_USE_FILE})
-ENDIF(NOT WikiExamples_BINARY_DIR)
+if(NOT WikiExamples_BINARY_DIR)
+find_package(VTK REQUIRED)
+if(NOT VTK_USE_RENDERING)
+  message(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
+endif(NOT VTK_USE_RENDERING)
+include(${VTK_USE_FILE})
+endif(NOT WikiExamples_BINARY_DIR)
 
-SET(KIT_LIBS ${VTK_LIBRARIES})
+set(KIT_LIBS ${VTK_LIBRARIES})
 
 # Build all .cxx files in the directory
-FILE(GLOB ALL_FILES *.cxx)
+file(GLOB ALL_FILES *.cxx)
 
 include(${WikiExamples_SOURCE_DIR}/CMake/RequiresVersion.cmake)
 foreach(SOURCE_FILE ${ALL_FILES})
-  STRING(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
-  STRING(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
-  ADD_EXECUTABLE(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
-  TARGET_LINK_LIBRARIES(${WIKI}${EXAMPLE} ${KIT_LIBS})
+  string(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
+  string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
+  add_executable(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
+  target_link_libraries(${WIKI}${EXAMPLE} ${KIT_LIBS})
 endforeach(SOURCE_FILE)
 
 if (BUILD_TESTING)
 # Testing
-SET(KIT StructuredPoints)
-SET(NEEDS_ARGS
+set(KIT StructuredPoints)
+set(NEEDS_ARGS
 )
-SET(DATA ${WikiExamples_SOURCE_DIR}/src/Testing/Data)
-SET(TEMP ${WikiExamples_BINARY_DIR}/Testing/Temporary)
-INCLUDE(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
+set(DATA ${WikiExamples_SOURCE_DIR}/src/Testing/Data)
+set(TEMP ${WikiExamples_BINARY_DIR}/Testing/Temporary)
+include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
 endif()
diff --git a/src/Cxx/Texture/CMakeLists.txt b/src/Cxx/Texture/CMakeLists.txt
index 2905e53e157..08f65a130da 100644
--- a/src/Cxx/Texture/CMakeLists.txt
+++ b/src/Cxx/Texture/CMakeLists.txt
@@ -1,47 +1,47 @@
-PROJECT (${WIKI}Texture)
+project (${WIKI}Texture)
 
-IF(NOT WikiExamples_BINARY_DIR)
-FIND_PACKAGE(VTK REQUIRED)
-IF(NOT VTK_USE_RENDERING)
-  MESSAGE(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
-ENDIF(NOT VTK_USE_RENDERING)
-INCLUDE(${VTK_USE_FILE})
-ENDIF(NOT WikiExamples_BINARY_DIR)
+if(NOT WikiExamples_BINARY_DIR)
+find_package(VTK REQUIRED)
+if(NOT VTK_USE_RENDERING)
+  message(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
+endif(NOT VTK_USE_RENDERING)
+include(${VTK_USE_FILE})
+endif(NOT WikiExamples_BINARY_DIR)
 
 if("${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" LESS 5.8)
-  SET(KIT_LIBS vtkWidgets vtkHybrid)
+  set(KIT_LIBS vtkWidgets vtkHybrid)
 else()
-  SET(KIT_LIBS ${VTK_LIBRARIES})
+  set(KIT_LIBS ${VTK_LIBRARIES})
 endif()
 #
 # Build all .cxx files in the directory
-FILE(GLOB ALL_FILES *.cxx)
+file(GLOB ALL_FILES *.cxx)
 
 include(${WikiExamples_SOURCE_DIR}/CMake/RequiresVersion.cmake)
 
 foreach(SOURCE_FILE ${ALL_FILES})
-  STRING(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
-  STRING(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
-  ADD_EXECUTABLE(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
-  TARGET_LINK_LIBRARIES(${WIKI}${EXAMPLE} ${KIT_LIBS})
+  string(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
+  string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
+  add_executable(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
+  target_link_libraries(${WIKI}${EXAMPLE} ${KIT_LIBS})
 endforeach(SOURCE_FILE)
 
 if (BUILD_TESTING)
 # Testing
-SET(KIT Texture)
-SET(NEEDS_ARGS
+set(KIT Texture)
+set(NEEDS_ARGS
   TextureCutSphere
   TexturedSphere
 )
 
-SET(DATA ${WikiExamples_SOURCE_DIR}/src/Testing/Data)
-SET(TEMP ${WikiExamples_BINARY_DIR}/Testing/Temporary)
+set(DATA ${WikiExamples_SOURCE_DIR}/src/Testing/Data)
+set(TEMP ${WikiExamples_BINARY_DIR}/Testing/Temporary)
 
-ADD_TEST(${KIT}-TextureCutSphere ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-TextureCutSphere ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestTextureCutSphere ${DATA}/texThres.vtk)
 
-ADD_TEST(${KIT}-TexturedSphere ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-TexturedSphere ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestTexturedSphere ${DATA}/earth.ppm)
 
-INCLUDE(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
+include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
 endif()
diff --git a/src/Cxx/UnstructuredGrid/CMakeLists.txt b/src/Cxx/UnstructuredGrid/CMakeLists.txt
index ea315896771..d2c207c2c1a 100644
--- a/src/Cxx/UnstructuredGrid/CMakeLists.txt
+++ b/src/Cxx/UnstructuredGrid/CMakeLists.txt
@@ -1,30 +1,30 @@
-PROJECT (${WIKI}UnstructuredGrid)
+project (${WIKI}UnstructuredGrid)
 
-IF(NOT WikiExamples_BINARY_DIR)
-FIND_PACKAGE(VTK REQUIRED)
-IF(NOT VTK_USE_RENDERING)
-  MESSAGE(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
-ENDIF(NOT VTK_USE_RENDERING)
-INCLUDE(${VTK_USE_FILE})
-ENDIF(NOT WikiExamples_BINARY_DIR)
+if(NOT WikiExamples_BINARY_DIR)
+find_package(VTK REQUIRED)
+if(NOT VTK_USE_RENDERING)
+  message(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
+endif(NOT VTK_USE_RENDERING)
+include(${VTK_USE_FILE})
+endif(NOT WikiExamples_BINARY_DIR)
 
 if("${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" LESS 5.8)
-  SET(KIT_LIBS vtkHybrid)
+  set(KIT_LIBS vtkHybrid)
 else()
-  SET(KIT_LIBS ${VTK_LIBRARIES})
+  set(KIT_LIBS ${VTK_LIBRARIES})
 endif()
 #
 # Build all .cxx files in the directory
-FILE(GLOB ALL_FILES *.cxx)
+file(GLOB ALL_FILES *.cxx)
 foreach(SOURCE_FILE ${ALL_FILES})
-  STRING(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
-  STRING(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
-  ADD_EXECUTABLE(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
-  TARGET_LINK_LIBRARIES(${WIKI}${EXAMPLE} ${KIT_LIBS})
+  string(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
+  string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
+  add_executable(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
+  target_link_libraries(${WIKI}${EXAMPLE} ${KIT_LIBS})
 endforeach(SOURCE_FILE)
 
 if (BUILD_TESTING)
 # Testing
-SET(KIT UnstructuredGrid)
-INCLUDE(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
+set(KIT UnstructuredGrid)
+include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
 endif()
diff --git a/src/Cxx/Utilities/CMakeLists.txt b/src/Cxx/Utilities/CMakeLists.txt
index c2a0494b161..a590114ad41 100644
--- a/src/Cxx/Utilities/CMakeLists.txt
+++ b/src/Cxx/Utilities/CMakeLists.txt
@@ -1,21 +1,21 @@
-PROJECT (${WIKI}Utilities)
+project (${WIKI}Utilities)
 
-IF(NOT WikiExamples_BINARY_DIR)
-FIND_PACKAGE(VTK REQUIRED)
-IF(NOT VTK_USE_RENDERING)
-  MESSAGE(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
-ENDIF(NOT VTK_USE_RENDERING)
-INCLUDE(${VTK_USE_FILE})
-ENDIF(NOT WikiExamples_BINARY_DIR)
+if(NOT WikiExamples_BINARY_DIR)
+find_package(VTK REQUIRED)
+if(NOT VTK_USE_RENDERING)
+  message(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
+endif(NOT VTK_USE_RENDERING)
+include(${VTK_USE_FILE})
+endif(NOT WikiExamples_BINARY_DIR)
 
 if("${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" LESS 5.8)
-  SET(KIT_LIBS vtkRendering vtkHybrid vtkInfovis)
+  set(KIT_LIBS vtkRendering vtkHybrid vtkInfovis)
 else()
-  SET(KIT_LIBS ${VTK_LIBRARIES})
+  set(KIT_LIBS ${VTK_LIBRARIES})
 endif()
 #
 # Build all .cxx files in the directory
-FILE(GLOB ALL_FILES *.cxx)
+file(GLOB ALL_FILES *.cxx)
 
 include(${WikiExamples_SOURCE_DIR}/CMake/RequiresSettingOn.cmake)
 Requires_Setting_On (GetDataRoot BUILD_TESTING)
@@ -24,36 +24,36 @@ include(${WikiExamples_SOURCE_DIR}/CMake/RequiresVersion.cmake)
 Requires_Version(LUTUtilities "6.0.0" ALL_FILES)
 
 foreach(SOURCE_FILE ${ALL_FILES})
-  STRING(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
-  STRING(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
-  ADD_EXECUTABLE(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
-  TARGET_LINK_LIBRARIES(${WIKI}${EXAMPLE} ${KIT_LIBS})
+  string(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
+  string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
+  add_executable(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
+  target_link_libraries(${WIKI}${EXAMPLE} ${KIT_LIBS})
 endforeach(SOURCE_FILE)
 
 if (BUILD_TESTING)
 # Testing
-SET(KIT Utilities)
-SET(NEEDS_ARGS
+set(KIT Utilities)
+set(NEEDS_ARGS
   SaveSceneToFieldData
   SaveSceneToFile
   ViewportBorders
   ZBuffer
 )
-SET(DATA ${WikiExamples_SOURCE_DIR}/src/Testing/Data)
-SET(TEMP ${WikiExamples_BINARY_DIR}/Testing/Temporary)
+set(DATA ${WikiExamples_SOURCE_DIR}/src/Testing/Data)
+set(TEMP ${WikiExamples_BINARY_DIR}/Testing/Temporary)
 
-ADD_TEST(${KIT}-SaveSceneToFile ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-SaveSceneToFile ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestSaveSceneToFile ${DATA}/Armadillo.ply ${TEMP}/Armadillo.txt)
 
-ADD_TEST(${KIT}-SaveSceneToFieldData ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-SaveSceneToFieldData ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestSaveSceneToFieldData ${DATA}/Armadillo.ply)
 
-ADD_TEST(${KIT}-ViewportBorders ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ViewportBorders ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestViewportBorders ${DATA}/v.vtk ${DATA}/t.vtk ${DATA}/k.vtk)
 
-ADD_TEST(${KIT}-ZBuffer ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ZBuffer ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestZBuffer ${DATA}/Bunny.vtp ${TEMP}/ZBuffer.bmp)
 
-INCLUDE(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
+include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
 
 endif()
diff --git a/src/Cxx/Video/CMakeLists.txt b/src/Cxx/Video/CMakeLists.txt
index 2f01f6cbaba..7fcd0fc2c1b 100644
--- a/src/Cxx/Video/CMakeLists.txt
+++ b/src/Cxx/Video/CMakeLists.txt
@@ -1,21 +1,21 @@
-PROJECT (${WIKI}Video)
+project (${WIKI}Video)
 
-IF(NOT WikiExamples_BINARY_DIR)
-FIND_PACKAGE(VTK REQUIRED)
-IF(NOT VTK_USE_RENDERING)
-  MESSAGE(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
-ENDIF(NOT VTK_USE_RENDERING)
-INCLUDE(${VTK_USE_FILE})
-ENDIF(NOT WikiExamples_BINARY_DIR)
+if(NOT WikiExamples_BINARY_DIR)
+find_package(VTK REQUIRED)
+if(NOT VTK_USE_RENDERING)
+  message(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
+endif(NOT VTK_USE_RENDERING)
+include(${VTK_USE_FILE})
+endif(NOT WikiExamples_BINARY_DIR)
 
 include(${WikiExamples_SOURCE_DIR}/CMake/RequiresSettingOn.cmake)
 
 Requires_Setting_On(vtkAVIWriter VTK_USE_VIDEO_FOR_WINDOWS)
-IF(WIN32)
-  IF(VTK_USE_VIDEO_FOR_WINDOWS)
-    SET(KIT_LIBS ${KIT_LIBS} vfw32)
-  ENDIF(VTK_USE_VIDEO_FOR_WINDOWS)
-ENDIF(WIN32)
+if(WIN32)
+  if(VTK_USE_VIDEO_FOR_WINDOWS)
+    set(KIT_LIBS ${KIT_LIBS} vfw32)
+  endif(VTK_USE_VIDEO_FOR_WINDOWS)
+endif(WIN32)
 Requires_Setting_On(AVI VTK_USE_VIDEO_FOR_WINDOWS)
 Requires_Setting_On(MPEG2 VTK_USE_MPEG2_ENCODER)
 Requires_Setting_On(FFMPEG VTK_USE_FFMPEG2_ENCODER)
diff --git a/src/Cxx/Views/CMakeLists.txt b/src/Cxx/Views/CMakeLists.txt
index d91cddf03b1..17492072a71 100644
--- a/src/Cxx/Views/CMakeLists.txt
+++ b/src/Cxx/Views/CMakeLists.txt
@@ -1,24 +1,24 @@
-PROJECT (${WIKI}Views)
+project (${WIKI}Views)
 
-IF(NOT WikiExamples_BINARY_DIR)
-FIND_PACKAGE(VTK REQUIRED)
-IF(NOT VTK_USE_VIEWS)
-  MESSAGE(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_VIEWS.")
-ENDIF(NOT VTK_USE_VIEWS)
-INCLUDE(${VTK_USE_FILE})
-ENDIF(NOT WikiExamples_BINARY_DIR)
+if(NOT WikiExamples_BINARY_DIR)
+find_package(VTK REQUIRED)
+if(NOT VTK_USE_VIEWS)
+  message(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_VIEWS.")
+endif(NOT VTK_USE_VIEWS)
+include(${VTK_USE_FILE})
+endif(NOT WikiExamples_BINARY_DIR)
 
 if("${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" LESS 5.8)
-  SET(KIT_LIBS vtkWidgets vtkRendering vtkHybrid vtkViews)
+  set(KIT_LIBS vtkWidgets vtkRendering vtkHybrid vtkViews)
 else()
-  SET(KIT_LIBS ${VTK_LIBRARIES})
+  set(KIT_LIBS ${VTK_LIBRARIES})
 endif()
 #
 # Build all .cxx files in the directory
-FILE(GLOB ALL_FILES *.cxx)
+file(GLOB ALL_FILES *.cxx)
 foreach(SOURCE_FILE ${ALL_FILES})
-  STRING(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
-  STRING(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
-  ADD_EXECUTABLE(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
-  TARGET_LINK_LIBRARIES(${WIKI}${EXAMPLE} ${KIT_LIBS})
+  string(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
+  string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
+  add_executable(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
+  target_link_libraries(${WIKI}${EXAMPLE} ${KIT_LIBS})
 endforeach(SOURCE_FILE)
diff --git a/src/Cxx/Visualization/CMakeLists.txt b/src/Cxx/Visualization/CMakeLists.txt
index 284fd5838f8..504fad9e986 100644
--- a/src/Cxx/Visualization/CMakeLists.txt
+++ b/src/Cxx/Visualization/CMakeLists.txt
@@ -1,21 +1,21 @@
-PROJECT (${WIKI}Visualization)
+project (${WIKI}Visualization)
 
-IF(NOT WikiExamples_BINARY_DIR)
-FIND_PACKAGE(VTK REQUIRED)
-IF(NOT VTK_USE_RENDERING)
-  MESSAGE(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
-ENDIF(NOT VTK_USE_RENDERING)
-INCLUDE(${VTK_USE_FILE})
-ENDIF(NOT WikiExamples_BINARY_DIR)
+if(NOT WikiExamples_BINARY_DIR)
+find_package(VTK REQUIRED)
+if(NOT VTK_USE_RENDERING)
+  message(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
+endif(NOT VTK_USE_RENDERING)
+include(${VTK_USE_FILE})
+endif(NOT WikiExamples_BINARY_DIR)
 
 if("${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" LESS 5.8)
-  SET(KIT_LIBS vtkWidgets vtkRendering vtkHybrid)
+  set(KIT_LIBS vtkWidgets vtkRendering vtkHybrid)
 else()
-  SET(KIT_LIBS ${VTK_LIBRARIES})
+  set(KIT_LIBS ${VTK_LIBRARIES})
 endif()
 #
 # Build all .cxx files in the directory
-FILE(GLOB ALL_FILES *.cxx)
+file(GLOB ALL_FILES *.cxx)
 
 include(${WikiExamples_SOURCE_DIR}/CMake/RequiresVersion.cmake)
 include(${WikiExamples_SOURCE_DIR}/CMake/RequiresModule.cmake)
@@ -36,16 +36,16 @@ Requires_Module(Shadows vtkRenderingOpenGL)
 #Requires_Setting_Off(StreamLines VTK_LEGACY_REMOVE)
 
 foreach(SOURCE_FILE ${ALL_FILES})
-  STRING(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
-  STRING(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
-  ADD_EXECUTABLE(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
-  TARGET_LINK_LIBRARIES(${WIKI}${EXAMPLE} ${KIT_LIBS})
+  string(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
+  string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
+  add_executable(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
+  target_link_libraries(${WIKI}${EXAMPLE} ${KIT_LIBS})
 endforeach(SOURCE_FILE)
 
 if (BUILD_TESTING)
 # Testing
-SET(KIT Visualization)
-SET(NEEDS_ARGS
+set(KIT Visualization)
+set(NEEDS_ARGS
   AlphaFrequency
   Arbitrary3DCursor
   BackgroundTexture
@@ -77,97 +77,97 @@ SET(NEEDS_ARGS
   Visualize2DPoints
 )
 
-SET(DATA ${WikiExamples_SOURCE_DIR}/src/Testing/Data)
-SET(TEMP ${WikiExamples_BINARY_DIR}/Testmake rebuing/Temporary)
+set(DATA ${WikiExamples_SOURCE_DIR}/src/Testing/Data)
+set(TEMP ${WikiExamples_BINARY_DIR}/Testmake rebuing/Temporary)
 
-ADD_TEST(${KIT}-AlphaFrequency ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-AlphaFrequency ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestAlphaFrequency ${DATA}/Gettysburg.txt)
 
-ADD_TEST(${KIT}-Arbitrary3DCursor ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-Arbitrary3DCursor ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestArbitrary3DCursor ${DATA}/Bunny.vtp)
 
-ADD_TEST(${KIT}-BackgroundTexture ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-BackgroundTexture ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestBackgroundTexture -E 30)
 
-ADD_TEST(${KIT}-BlobbyLogo ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-BlobbyLogo ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestBlobbyLogo ${DATA}/v.vtk ${DATA}/t.vtk ${DATA}/k.vtk)
 
-ADD_TEST(${KIT}-BoxClipStructuredPoints ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-BoxClipStructuredPoints ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestBoxClipStructuredPoints ${DATA}/HeadMRVolume.mhd)
 
-ADD_TEST(${KIT}-BoxClipUnstructuredGrid ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-BoxClipUnstructuredGrid ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestBoxClipUnstructuredGrid ${DATA}/hexa.vtk)
 
-ADD_TEST(${KIT}-ComplexV ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ComplexV ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestComplexV ${DATA}/carotid.vtk)
 
-ADD_TEST(${KIT}-ClipArt ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ClipArt ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestClipArt ${DATA}/stormy.jpg)
 
-ADD_TEST(${KIT}-ChooseTextColor ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ChooseTextColor ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestChooseTextColor ${DATA}/Canterbury.ttf Pink  MintCream SaddleBrown)
 
-ADD_TEST(${KIT}-ChooseTextColorDemo ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-ChooseTextColorDemo ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestChooseTextColorDemo .8 mintcream ivoryblack)
 
-ADD_TEST(${KIT}-CorrectlyRenderTranslucentGeometry ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-CorrectlyRenderTranslucentGeometry ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestCorrectlyRenderTranslucentGeometry 100 100 50 0.1 0 0)
 
-ADD_TEST(${KIT}-CurvedReformation ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-CurvedReformation ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestCurvedReformation ${DATA}/HeadMRVolume.mhd ${DATA}/polyline.vtk 200)
 
-ADD_TEST(${KIT}-DepthSortPolyData ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-DepthSortPolyData ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestDepthSortPolyData 1 100 100 0)
 
 if (SplineDrivenImageSlicer_LOADED)
-  ADD_TEST(${KIT}-ExtrudePolyDataAlongLine ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+  add_test(${KIT}-ExtrudePolyDataAlongLine ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
     TestExtrudePolyDataAlongLine ${DATA}/a.vtp)
 endif()
 
-ADD_TEST(${KIT}-FontFile ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-FontFile ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestFontFile ${DATA}/CopyPaste.ttf)
 
-ADD_TEST(${KIT}-Glyph3DImage ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-Glyph3DImage ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestGlyph3DImage ${DATA}/emote.jpg)
 
-ADD_TEST(${KIT}-Glyph3DMapper ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-Glyph3DMapper ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestGlyph3DMapper -E 40)
 
-ADD_TEST(${KIT}-Hawaii ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-Hawaii ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestHawaii ${DATA}/honolulu.vtk)
 
-ADD_TEST(${KIT}-HedgeHog ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-HedgeHog ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestHedgeHog -E 50)
 
-ADD_TEST(${KIT}-Kitchen ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-Kitchen ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestKitchen ${DATA}/kitchen.vtk)
 
-ADD_TEST(${KIT}-NormalsDemo ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-NormalsDemo ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestNormalsDemo ${DATA}/42400-IDGH.stl)
 
-ADD_TEST(${KIT}-PointDataSubdivision ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-PointDataSubdivision ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestPointDataSubdivision 2)
 
-ADD_TEST(${KIT}-RenderLargeImage ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-RenderLargeImage ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestRenderLargeImage ${DATA}/Bunny.vtp ${TEMP}/Bunny.png 4)
 
-ADD_TEST(${KIT}-SelectWindowRegion ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-SelectWindowRegion ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestSelectWindowRegion ${DATA}/Ox.jpg)
 
-ADD_TEST(${KIT}-StreamLines ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-StreamLines ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestStreamLines ${DATA}/combxyz.bin ${DATA}/combq.bin)
 
-ADD_TEST(${KIT}-TextureMapPlane ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-TextureMapPlane ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestTextureMapPlane ${DATA}/Yinyang.jpg)
 
-ADD_TEST(${KIT}-TextureMapQuad ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-TextureMapQuad ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestTextureMapQuad ${DATA}/Yinyang.jpg)
 
-ADD_TEST(${KIT}-VisualizeVTP ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-VisualizeVTP ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestVisualizeVTP ${DATA}/Bunny.vtp)
 
-ADD_TEST(${KIT}-Visualize2DPoints ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-Visualize2DPoints ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestVisualize2DPoints ${DATA}/Ring.vtp)
 
-INCLUDE(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
+include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
 endif()
diff --git a/src/Cxx/VisualizationAlgorithms/CMakeLists.txt b/src/Cxx/VisualizationAlgorithms/CMakeLists.txt
index f293f36f259..19106da217a 100644
--- a/src/Cxx/VisualizationAlgorithms/CMakeLists.txt
+++ b/src/Cxx/VisualizationAlgorithms/CMakeLists.txt
@@ -1,32 +1,32 @@
-PROJECT (${WIKI}VisualizationAlgorithms)
+project (${WIKI}VisualizationAlgorithms)
 
-IF(NOT WikiExamples_BINARY_DIR)
-FIND_PACKAGE(VTK REQUIRED)
-IF(NOT VTK_USE_RENDERING)
-  MESSAGE(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
-ENDIF(NOT VTK_USE_RENDERING)
-INCLUDE(${VTK_USE_FILE})
-ENDIF(NOT WikiExamples_BINARY_DIR)
+if(NOT WikiExamples_BINARY_DIR)
+find_package(VTK REQUIRED)
+if(NOT VTK_USE_RENDERING)
+  message(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
+endif(NOT VTK_USE_RENDERING)
+include(${VTK_USE_FILE})
+endif(NOT WikiExamples_BINARY_DIR)
 
 if("${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" LESS 5.8)
-  SET(KIT_LIBS vtkRendering vtkHybrid)
+  set(KIT_LIBS vtkRendering vtkHybrid)
 else()
-  SET(KIT_LIBS ${VTK_LIBRARIES})
+  set(KIT_LIBS ${VTK_LIBRARIES})
 endif()
 #
 # Build all .cxx files in the directory
-FILE(GLOB ALL_FILES *.cxx)
+file(GLOB ALL_FILES *.cxx)
 foreach(SOURCE_FILE ${ALL_FILES})
-  STRING(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
-  STRING(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
-  ADD_EXECUTABLE(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
-  TARGET_LINK_LIBRARIES(${WIKI}${EXAMPLE} ${KIT_LIBS})
+  string(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
+  string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
+  add_executable(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
+  target_link_libraries(${WIKI}${EXAMPLE} ${KIT_LIBS})
 endforeach(SOURCE_FILE)
 
 if (BUILD_TESTING)
 # Testing
-SET(KIT VisualizationAlgorithms)
-SET(NEEDS_ARGS
+set(KIT VisualizationAlgorithms)
+set(NEEDS_ARGS
   BluntStreamlines
   CombustorIsosurface
   CreateBFont
@@ -44,55 +44,55 @@ SET(NEEDS_ARGS
   SpikeFran
   WarpCombustor
 )
-SET(DATA ${WikiExamples_SOURCE_DIR}/src/Testing/Data)
+set(DATA ${WikiExamples_SOURCE_DIR}/src/Testing/Data)
 
-ADD_TEST(${KIT}-BluntStreamlines ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-BluntStreamlines ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestBluntStreamlines ${DATA}/bluntfinxyz.bin ${DATA}/bluntfinq.bin)
 
-ADD_TEST(${KIT}-CombustorIsosurface ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-CombustorIsosurface ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestCombustorIsosurface ${DATA}/combxyz.bin ${DATA}/combq.bin)
 
-ADD_TEST(${KIT}-CreateBFont ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-CreateBFont ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestCreateBFont ${DATA}/B.pgm)
 
-ADD_TEST(${KIT}-CutWithCutFunction ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-CutWithCutFunction ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestCutWithCutFunction ${DATA}/Torso.vtp 20)
 
-ADD_TEST(${KIT}-CutWithScalars ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-CutWithScalars ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestCutWithScalars ${DATA}/Torso.vtp 20)
 
-ADD_TEST(${KIT}-DisplacementPlot ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-DisplacementPlot ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestDisplacementPlot ${DATA}/plate.vtk)
 
-ADD_TEST(${KIT}-FilledContours ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-FilledContours ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestFilledContours ${DATA}/filledContours.vtp 10)
 
-ADD_TEST(${KIT}-FindCellIntersections ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-FindCellIntersections ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestFindCellIntersections ${DATA}/Disc_BiQuadraticQuads_0_0.vtu)
 
-ADD_TEST(${KIT}-Hello ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-Hello ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestHello ${DATA}/hello.vtk)
 
-ADD_TEST(${KIT}-LOx ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-LOx ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestLOx ${DATA}/postxyz.bin ${DATA}/postq.bin)
 
-ADD_TEST(${KIT}-MarchingCases ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-MarchingCases ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestMarchingCases 7)
 
-ADD_TEST(${KIT}-MarchingCasesA ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-MarchingCasesA ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestMarchingCasesA 1 2 3 4 5 6 7 8 9 10 11 12 13 14)
 
-ADD_TEST(${KIT}-MarchingCasesB ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-MarchingCasesB ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestMarchingCasesB -3 -6 -7 -10 -12 -13)
 
-ADD_TEST(${KIT}-PlateVibration ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-PlateVibration ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestPlateVibration ${DATA}/plate.vtk)
 
-ADD_TEST(${KIT}-SpikeFran ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-SpikeFran ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestSpikeFran ${DATA}/fran_cut.vtk)
 
-ADD_TEST(${KIT}-WarpCombustor ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-WarpCombustor ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestWarpCombustor ${DATA}/combxyz.bin ${DATA}/combq.bin)
 
-INCLUDE(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
+include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
 endif()
diff --git a/src/Cxx/VisualizationAlgorithms/CMakeLists.txt.orig b/src/Cxx/VisualizationAlgorithms/CMakeLists.txt.orig
new file mode 100644
index 00000000000..b6f0235578b
--- /dev/null
+++ b/src/Cxx/VisualizationAlgorithms/CMakeLists.txt.orig
@@ -0,0 +1,102 @@
+project (${WIKI}VisualizationAlgorithms)
+
+if(NOT WikiExamples_BINARY_DIR)
+find_package(VTK REQUIRED)
+if(NOT VTK_USE_RENDERING)
+  message(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
+endif(NOT VTK_USE_RENDERING)
+include(${VTK_USE_FILE})
+endif(NOT WikiExamples_BINARY_DIR)
+
+if("${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" LESS 5.8)
+  set(KIT_LIBS vtkRendering vtkHybrid)
+else()
+  set(KIT_LIBS ${VTK_LIBRARIES})
+endif()
+#
+# Build all .cxx files in the directory
+file(GLOB ALL_FILES *.cxx)
+foreach(SOURCE_FILE ${ALL_FILES})
+  string(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
+  string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
+  add_executable(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
+  target_link_libraries(${WIKI}${EXAMPLE} ${KIT_LIBS})
+endforeach(SOURCE_FILE)
+
+if (BUILD_TESTING)
+# Testing
+set(KIT VisualizationAlgorithms)
+set(NEEDS_ARGS
+  BluntStreamlines
+  CombustorIsosurface
+  CreateBFont
+  CutWithCutFunction
+  CutWithScalars
+  DisplacementPlot
+  FilledContours
+  FindCellIntersections
+  Hello
+  LOx
+  MarchingCases
+  MarchingCasesA
+  MarchingCasesB
+  PlateVibration
+  SpikeFran
+  WarpCombustor
+)
+set(DATA ${WikiExamples_SOURCE_DIR}/src/Testing/Data)
+
+add_test(${KIT}-BluntStreamlines ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+  TestBluntStreamlines ${DATA}/bluntfinxyz.bin ${DATA}/bluntfinq.bin)
+
+add_test(${KIT}-CombustorIsosurface ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+  TestCombustorIsosurface ${DATA}/combxyz.bin ${DATA}/combq.bin)
+
+add_test(${KIT}-CreateBFont ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+  TestCreateBFont ${DATA}/B.pgm)
+
+add_test(${KIT}-CutWithCutFunction ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+  TestCutWithCutFunction ${DATA}/Torso.vtp 20)
+
+add_test(${KIT}-CutWithScalars ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+  TestCutWithScalars ${DATA}/Torso.vtp 20)
+
+add_test(${KIT}-DisplacementPlot ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+  TestDisplacementPlot ${DATA}/plate.vtk)
+
+add_test(${KIT}-FilledContours ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+  TestFilledContours ${DATA}/filledContours.vtp 10)
+
+add_test(${KIT}-FindCellIntersections ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+  TestFindCellIntersections ${DATA}/Disc_BiQuadraticQuads_0_0.vtu)
+
+add_test(${KIT}-Hello ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+  TestHello ${DATA}/hello.vtk)
+
+add_test(${KIT}-LOx ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+  TestLOx ${DATA}/postxyz.bin ${DATA}/postq.bin)
+
+add_test(${KIT}-MarchingCases ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+  TestMarchingCases 7)
+
+add_test(${KIT}-MarchingCasesA ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+  TestMarchingCasesA 1 2 3 4 5 6 7 8 9 10 11 12 13 14)
+
+add_test(${KIT}-MarchingCasesB ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+  TestMarchingCasesB -3 -6 -7 -10 -12 -13)
+
+add_test(${KIT}-PlateVibration ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+  TestPlateVibration ${DATA}/plate.vtk)
+
+<<<<<<< d1c12ade8600ceab4bc8346655652256407163fb
+ADD_TEST(${KIT}-SpikeFran ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+  TestSpikeFran ${DATA}/fran_cut.vtk)
+
+ADD_TEST(${KIT}-WarpCombustor ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+=======
+add_test(${KIT}-WarpCombustor ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+>>>>>>> STYLE: Convert CMake-language commands to lower case
+  TestWarpCombustor ${DATA}/combxyz.bin ${DATA}/combq.bin)
+
+include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
+endif()
diff --git a/src/Cxx/VolumeRendering/CMakeLists.txt b/src/Cxx/VolumeRendering/CMakeLists.txt
index 38a9e72f306..393660d3f27 100644
--- a/src/Cxx/VolumeRendering/CMakeLists.txt
+++ b/src/Cxx/VolumeRendering/CMakeLists.txt
@@ -1,21 +1,21 @@
-PROJECT (${WIKI}VolumeRendering)
+project (${WIKI}VolumeRendering)
 
-IF(NOT WikiExamples_BINARY_DIR)
-FIND_PACKAGE(VTK REQUIRED)
-IF(NOT VTK_USE_RENDERING)
-  MESSAGE(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
-ENDIF(NOT VTK_USE_RENDERING)
-INCLUDE(${VTK_USE_FILE})
-ENDIF(NOT WikiExamples_BINARY_DIR)
+if(NOT WikiExamples_BINARY_DIR)
+find_package(VTK REQUIRED)
+if(NOT VTK_USE_RENDERING)
+  message(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
+endif(NOT VTK_USE_RENDERING)
+include(${VTK_USE_FILE})
+endif(NOT WikiExamples_BINARY_DIR)
 
 if("${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" LESS 5.8)
-  SET(KIT_LIBS vtkRendering vtkVolumeRendering vtkHybrid)
+  set(KIT_LIBS vtkRendering vtkVolumeRendering vtkHybrid)
 else()
-  SET(KIT_LIBS ${VTK_LIBRARIES})
+  set(KIT_LIBS ${VTK_LIBRARIES})
 endif()
 #
 # Build all .cxx files in the directory
-FILE(GLOB ALL_FILES *.cxx)
+file(GLOB ALL_FILES *.cxx)
 
 if (VTK_RENDERING_BACKEND STREQUAL "OpenGL2")
   list(REMOVE_ITEM ALL_FILES
@@ -25,52 +25,52 @@ if (VTK_RENDERING_BACKEND STREQUAL "OpenGL2")
 endif()
 
 foreach(SOURCE_FILE ${ALL_FILES})
-  STRING(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
-  STRING(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
-  ADD_EXECUTABLE(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
-  TARGET_LINK_LIBRARIES(${WIKI}${EXAMPLE} ${KIT_LIBS})
+  string(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
+  string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
+  add_executable(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
+  target_link_libraries(${WIKI}${EXAMPLE} ${KIT_LIBS})
 endforeach(SOURCE_FILE)
 
 if (BUILD_TESTING)
 # Testing
-SET(KIT VolumeRendering)
+set(KIT VolumeRendering)
 if (VTK_RENDERING_BACKEND STREQUAL "OpenGL2")
-  SET(NEEDS_ARGS
+  set(NEEDS_ARGS
     PseudoVolumeRendering
     MinIntensityRendering
     IntermixedUnstructuredGrid
     FixedPointVolumeRayCastMapperCT
   )
 else()
-  SET(NEEDS_ARGS
+  set(NEEDS_ARGS
     HAVSVolumeMapper
     MinIntensityRendering
     IntermixedUnstructuredGrid
   )
 endif()
 
-SET(DATA ${WikiExamples_SOURCE_DIR}/src/Testing/Data)
-SET(TEMP ${WikiExamples_BINARY_DIR}/Testing/Temporary)
+set(DATA ${WikiExamples_SOURCE_DIR}/src/Testing/Data)
+set(TEMP ${WikiExamples_BINARY_DIR}/Testing/Temporary)
 
 if (VTK_RENDERING_BACKEND STREQUAL "OpenGL2")
-ADD_TEST(${KIT}-MinIntensityRendering ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-MinIntensityRendering ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestMinIntensityRendering ${DATA}/ironProt.vtk)
-ADD_TEST(${KIT}-FixedPointVolumeRayCastMapperCT ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-FixedPointVolumeRayCastMapperCT ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestFixedPointVolumeRayCastMapperCT -MHA ${DATA}/FullHead.mhd -CT_Bone)
 else()
-ADD_TEST(${KIT}-HAVSVolumeMapper ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-HAVSVolumeMapper ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestHAVSVolumeMapper ${DATA}/ironProt.vtk ${DATA}/neghip.slc)
 
-ADD_TEST(${KIT}-MinIntensityRendering ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-MinIntensityRendering ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestMinIntensityRendering ${DATA}/ironProt.vtk)
 endif()
 
-ADD_TEST(${KIT}-PseudoVolumeRendering ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-PseudoVolumeRendering ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestPseudoVolumeRendering ${DATA}/combxyz.bin ${DATA}/combq.bin)
 
-ADD_TEST(${KIT}-IntermixedUnstructuredGrid ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-IntermixedUnstructuredGrid ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestIntermixedUnstructuredGrid ${DATA}/ironProt.vtk ${DATA}/neghip.slc)
 
-INCLUDE(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
+include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
 
 endif()
diff --git a/src/Cxx/Widgets/CMakeLists.txt b/src/Cxx/Widgets/CMakeLists.txt
index a35afacaa49..28880022afc 100644
--- a/src/Cxx/Widgets/CMakeLists.txt
+++ b/src/Cxx/Widgets/CMakeLists.txt
@@ -1,51 +1,51 @@
-PROJECT (${WIKI}Widgets)
+project (${WIKI}Widgets)
 
-IF(NOT WikiExamples_BINARY_DIR)
-FIND_PACKAGE(VTK REQUIRED)
-IF(NOT VTK_USE_RENDERING)
-  MESSAGE(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
-ENDIF(NOT VTK_USE_RENDERING)
-INCLUDE(${VTK_USE_FILE})
-ENDIF(NOT WikiExamples_BINARY_DIR)
+if(NOT WikiExamples_BINARY_DIR)
+find_package(VTK REQUIRED)
+if(NOT VTK_USE_RENDERING)
+  message(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
+endif(NOT VTK_USE_RENDERING)
+include(${VTK_USE_FILE})
+endif(NOT WikiExamples_BINARY_DIR)
 
 if("${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" LESS 6.0)
-  SET(KIT_LIBS vtkHybrid vtkWidgets)
+  set(KIT_LIBS vtkHybrid vtkWidgets)
 else()
-  SET(KIT_LIBS ${VTK_LIBRARIES})
+  set(KIT_LIBS ${VTK_LIBRARIES})
 endif()
 #
 # Build all .cxx files in the directory
-FILE(GLOB ALL_FILES *.cxx)
+file(GLOB ALL_FILES *.cxx)
 foreach(SOURCE_FILE ${ALL_FILES})
-  STRING(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
-  STRING(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
-  ADD_EXECUTABLE(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
-  TARGET_LINK_LIBRARIES(${WIKI}${EXAMPLE} ${KIT_LIBS})
+  string(REPLACE ".cxx" "" TMP ${SOURCE_FILE})
+  string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" EXAMPLE ${TMP})
+  add_executable(${WIKI}${EXAMPLE} ${EXECUTABLE_FLAG} ${EXAMPLE}.cxx)
+  target_link_libraries(${WIKI}${EXAMPLE} ${KIT_LIBS})
 endforeach(SOURCE_FILE)
 
 if (BUILD_TESTING)
 # Testing
-SET(KIT Widgets)
+set(KIT Widgets)
 
-SET(NEEDS_ARGS
+set(NEEDS_ARGS
   CheckerboardWidget
   OrientationMarkerWidget
   Slicer2D
   RectilinearWipeWidget
 )
 
-SET(DATA ${WikiExamples_SOURCE_DIR}/src/Testing/Data)
-ADD_TEST(${KIT}-OrientationMarkerWidget ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+set(DATA ${WikiExamples_SOURCE_DIR}/src/Testing/Data)
+add_test(${KIT}-OrientationMarkerWidget ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestOrientationMarkerWidget ${DATA}/Bunny.vtp)
 
-ADD_TEST(${KIT}-RectilinearWipeWidget ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-RectilinearWipeWidget ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestRectilinearWipeWidget ${DATA}/Gourds2.jpg ${DATA}/Ox.jpg)
 
-ADD_TEST(${KIT}-CheckerboardWidget ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-CheckerboardWidget ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestCheckerboardWidget ${DATA}/Gourds2.jpg ${DATA}/Ox.jpg)
 
-ADD_TEST(${KIT}-Slider2D ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
+add_test(${KIT}-Slider2D ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests
   TestSlider2D -E 25)
-INCLUDE(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
+include(${WikiExamples_SOURCE_DIR}/CMake/ExamplesTesting.cmake)
 
 endif()
diff --git a/src/Developers/CMakeLists.txt b/src/Developers/CMakeLists.txt
index c83d92c8447..2151b7a8ee0 100644
--- a/src/Developers/CMakeLists.txt
+++ b/src/Developers/CMakeLists.txt
@@ -1,24 +1,24 @@
-PROJECT (${WIKI}Developers)
+project (${WIKI}Developers)
 
-IF(NOT WikiExamples_BINARY_DIR)
-FIND_PACKAGE(VTK REQUIRED)
-INCLUDE(${VTK_USE_FILE})
-ENDIF(NOT WikiExamples_BINARY_DIR)
+if(NOT WikiExamples_BINARY_DIR)
+find_package(VTK REQUIRED)
+include(${VTK_USE_FILE})
+endif(NOT WikiExamples_BINARY_DIR)
 
-ADD_EXECUTABLE(Progress Progress.cxx vtkTestFilter.cxx)
-TARGET_LINK_LIBRARIES(Progress vtkHybrid)
+add_executable(Progress Progress.cxx vtkTestFilter.cxx)
+target_link_libraries(Progress vtkHybrid)
 
-ADD_EXECUTABLE(ReaderExample ReaderExample.cxx vtkTestReader.cxx)
-TARGET_LINK_LIBRARIES(ReaderExample vtkHybrid)
+add_executable(ReaderExample ReaderExample.cxx vtkTestReader.cxx)
+target_link_libraries(ReaderExample vtkHybrid)
 
-ADD_EXECUTABLE(FilterExample FilterExample.cxx vtkTestFilter.cxx)
-TARGET_LINK_LIBRARIES(FilterExample vtkHybrid)
+add_executable(FilterExample FilterExample.cxx vtkTestFilter.cxx)
+target_link_libraries(FilterExample vtkHybrid)
 
-ADD_EXECUTABLE(SourceExample SourceExample.cxx vtkTestSource.cxx)
-TARGET_LINK_LIBRARIES(SourceExample vtkHybrid)
+add_executable(SourceExample SourceExample.cxx vtkTestSource.cxx)
+target_link_libraries(SourceExample vtkHybrid)
 
-ADD_EXECUTABLE(vtkImageAlgorithmFilterExample vtkImageAlgorithmFilterExample.cxx vtkImageAlgorithmFilter.cxx)
-TARGET_LINK_LIBRARIES(vtkImageAlgorithmFilterExample vtkHybrid)
+add_executable(vtkImageAlgorithmFilterExample vtkImageAlgorithmFilterExample.cxx vtkImageAlgorithmFilter.cxx)
+target_link_libraries(vtkImageAlgorithmFilterExample vtkHybrid)
 
-ADD_EXECUTABLE(vtkImageAlgorithmSourceExample vtkImageAlgorithmSourceExample.cxx vtkImageAlgorithmSource.cxx)
-TARGET_LINK_LIBRARIES(vtkImageAlgorithmSourceExample vtkHybrid)
+add_executable(vtkImageAlgorithmSourceExample vtkImageAlgorithmSourceExample.cxx vtkImageAlgorithmSource.cxx)
+target_link_libraries(vtkImageAlgorithmSourceExample vtkHybrid)
-- 
GitLab