COMP: Unconditionally set wrapped shared lib directory

When wrapping for python, the shared library directory
setting must be unconditionally set.  The previous
code would only set the value to the proper
wrapping required directory if the value had
not previously been set.

If WRAP_PYTHON then we must unconditionally set the
CMAKE_LIBRARY_OUTPUT_DIRECTORY to specify the python compatible pathing.

If wrapping for python, then put all the shared libraries (both core
shared libs, and python shared libs in the itk python package
directory under ITK_SWIGLIB_SUBPKG_NAME.

CMake/ITKModuleExternal.cmake

@@ -39,15 +39,18 @@ endif()
 if(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
   set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${ITK_DIR}/bin CACHE PATH "Runtime output directory for ITK")
 endif()
-if(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)
-  if(ITK_WRAP_PYTHON)
-    # If wrapping for python, then put all the shared libraries (both core shared libs,
-    # and python shared libs in the itk python package directory under swiglib.
-    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${ITK_DIR}/Wrapping/Generators/Python/itk/swiglib CACHE PATH "Shared library directory, in wrapped directory.")
-  else()
+if(ITK_WRAP_PYTHON)
+  # IF WRAP_PYTHON then we must unconditionally set the CMAKE_LIBRARY_OUTPUT_DIRECTORY
+  # If wrapping for python, then put all the shared libraries (both core shared libs,
+  # and python shared libs in the itk python package directory under ITK_SWIGLIB_SUBPKG_NAME.
+  set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${ITK_DIR}/Wrapping/Generators/Python/itk/${ITK_SWIGLIB_SUBPKG_NAME}" CACHE PATH "Shared library directory, in wrapped directory.")
+else()
+  if(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)
     set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${ITK_DIR}/lib CACHE PATH "Shared library directory")
   endif()
 endif()
+
+
 if(NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
   set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${ITK_DIR}/lib CACHE PATH "Static library install directory")
 endif()

Wrapping/Generators/Python/itk/support/itkBase.py

@@ -147,7 +147,7 @@ def itk_load_swig_module(name, namespace=None):
 
                 # Get the attribute associated with the class name if it exists
                 template_container = getattr(
-                    this_module, py_class_name, itkTemplate.itkTemplate(cpp_class_name)
+                    this_module, py_class_name, itkTemplate(cpp_class_name)
                 )
 
                 try: