Check in patch for VIAME win32 python dir adj

cmake/add_project_viame.cmake

@@ -36,6 +36,13 @@ ExternalProject_Add(viame
   SOURCE_DIR ${CMAKE_SOURCE_DIR}
   BINARY_DIR ${VIAME_BUILD_PLUGINS_DIR}
   USES_TERMINAL_BUILD 1
+  PATCH_COMMAND ${CMAKE_COMMAND}
+    -DVIAME_CMAKE_DIR:PATH=${VIAME_CMAKE_DIR}
+    -DVIAME_INSTALL_PREFIX:PATH=${VIAME_INSTALL_PREFIX}
+    -DPYTHON_VERSION_STRING=${VIAME_PYTHON_STRING}
+    -DPYTHON_MAJOR_VERSION=${Python_VERSION_MAJOR}
+    -DPYTHON_MINOR_VERSION=${Python_VERSION_MINOR}
+    -P ${VIAME_SOURCE_DIR}/cmake/custom_patch_viame.cmake
   CMAKE_GENERATOR ${gen}
   CMAKE_CACHE_ARGS
     ${VIAME_ARGS_COMMON}

cmake/custom_install_fletch.cmake

@@ -107,4 +107,4 @@ except ImportError:\n\
   endif()
 endif()
 
-message( "Finished fletch custom install" )
+message( "Finished fletch custom install" )

cmake/custom_patch_viame.cmake

@@ -0,0 +1,22 @@
+message( "Patching VIAME python dependency install directories" )
+
+# Move any misinstalled python files
+if( PYTHON_VERSION_STRING )
+  # Sometimes VIAME subpackages install python files to incorrect python
+  # subdirectories, like lib/site-packages instead of lib/pythonX.Y/site-packages
+  set( ROOT_PYTHON_DIR "${VIAME_INSTALL_PREFIX}/lib/${PYTHON_VERSION_STRING}" )
+  set( OUTPUT_PYTHON_DIR "${ROOT_PYTHON_DIR}/site-packages/" )
+  set( PYTHON_VERSION_APPENDED "${PYTHON_MAJOR_VERSION}${PYTHON_MINOR_VERSION}" )
+
+  if( EXISTS ${VIAME_INSTALL_PREFIX}/Python${PYTHON_VERSION_APPENDED} )
+    file( GLOB FILES_TO_MOVE "${VIAME_INSTALL_PREFIX}/Python${PYTHON_VERSION_APPENDED}/site-packages/*" )
+    file( COPY ${FILES_TO_MOVE} DESTINATION ${OUTPUT_PYTHON_DIR} )
+    file( REMOVE_RECURSE "${VIAME_INSTALL_PREFIX}/Python${PYTHON_VERSION_APPENDED}" )
+  endif()
+
+  if( EXISTS ${VIAME_INSTALL_PREFIX}/lib/site-packages )
+    file( GLOB FILES_TO_MOVE "${VIAME_INSTALL_PREFIX}/lib/site-packages/*" )
+    file( COPY ${FILES_TO_MOVE} DESTINATION ${OUTPUT_PYTHON_DIR} )
+    file( REMOVE_RECURSE "${VIAME_INSTALL_PREFIX}/lib/site-packages" )
+  endif()
+endif()