Update ExternalProjectDependency based on commontk/Artichoke@0437a6d

Also include CTK specific patch 6cc426b (Ensure ctk option are considered
as superbuild candidate variable)

CMake/ctkExternalProjectAlwaysConfigure.cmake

@@ -1,31 +0,0 @@
-###########################################################################
-#
-#  Library:   CTK
-#
-#  Copyright (c) Kitware Inc.
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0.txt
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-#
-###########################################################################
-
-function(ExternalProject_AlwaysConfigure proj)
-  # This custom external project step forces the configure and later
-  # steps to run.
-  _ep_get_step_stampfile(${proj} "configure" stampfile)
-  ExternalProject_Add_Step(${proj} forceconfigure
-    COMMAND ${CMAKE_COMMAND} -E remove ${stampfile}
-    COMMENT "Forcing configure step for '${proj}'"
-    DEPENDEES build
-    ALWAYS 1
-    )
-endfunction()

CMake/ctkMacroCheckExternalProjectDependency.cmake

@@ -850,3 +850,24 @@ macro(ExternalProject_SetIfNotDefined var defaultvalue)
     set(${var} "${defaultvalue}")
   endif()
 endmacro()
+
+#.rst:
+# .. cmake:function:: ExternalProject_AlwaysConfigure
+#
+# Add a external project step named `forceconfigure` to `project_name` ensuring
+# the project will always be reconfigured.
+#
+# .. code-block:: cmake
+#
+#  ExternalProject_AlwaysConfigure(<project_name>)
+function(ExternalProject_AlwaysConfigure proj)
+  # This custom external project step forces the configure and later
+  # steps to run.
+  _ep_get_step_stampfile(${proj} "configure" stampfile)
+  ExternalProject_Add_Step(${proj} forceconfigure
+    COMMAND ${CMAKE_COMMAND} -E remove ${stampfile}
+    COMMENT "Forcing configure step for '${proj}'"
+    DEPENDEES build
+    ALWAYS 1
+    )
+endfunction()

SuperBuild.cmake

@@ -59,5 +59,4 @@ ExternalProject_Add(${proj}
     ${CTK_DEPENDENCIES}
   )
 
-include(ctkExternalProjectAlwaysConfigure)
 ExternalProject_AlwaysConfigure(${proj})