Commit ce0880ee authored by bonnell's avatar bonnell

Final tweak for vkt-6.1 python modules on Windows -- no 'egg' file!

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@22874 18c085ea-50e0-402c-830e-de6fd14e8384
parent 3ba4b779
......@@ -205,20 +205,29 @@ IF(VISIT_PYTHON_FILTERS)
ENDIF(NOT "${VTK_MODULE_SYM_CREATE}" STREQUAL "0")
ENDFOREACH(ITM ${VTK_PYTHON_MODULE_ITEMS})
ELSE (NOT WIN32)
FILE(GLOB VTK_EGG_FILE "${VISIT_VTK_DIR}/lib/site-packages/*egg*")
FILE(GLOB VTK_EGG_FILE "${VTK_PY_WRAPPERS_DIR}/site-packages/*egg*")
# because you don't need to choose your configuration up-front
# on windows, make this a custom target so they are copied to the
# correct lib/${CFG} directory
ADD_CUSTOM_TARGET(vtk_python_modules ALL)
ADD_CUSTOM_COMMAND(TARGET vtk_python_modules POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_directory
${VTK_PY_WRAPPERS_DIR}/site-packages/vtk
${VISIT_LIBRARY_DIR}/site-packages/vtk
COMMAND ${CMAKE_COMMAND} -E copy
${VTK_EGG_FILE}
${VISIT_LIBRARY_DIR}/site-packages
COMMENT "Copying ${VISIT_VTK_DIR}/lib/site-packages to ${VISIT_LIBRARY_DIR}/site-packages/vtk"
)
IF(${VTK_VERSION} VERSION_LESS "6.1.0")
ADD_CUSTOM_COMMAND(TARGET vtk_python_modules POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_directory
${VTK_PY_WRAPPERS_DIR}/site-packages/vtk
${VISIT_LIBRARY_DIR}/site-packages/vtk
COMMAND ${CMAKE_COMMAND} -E copy
${VTK_EGG_FILE}
${VISIT_LIBRARY_DIR}/site-packages
COMMENT "Copying ${VTK_PY_WRAPPERS_DIR}/site-packages to ${VISIT_LIBRARY_DIR}/site-packages/vtk"
)
ELSE()
ADD_CUSTOM_COMMAND(TARGET vtk_python_modules POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_directory
${VTK_PY_WRAPPERS_DIR}/site-packages/vtk
${VISIT_LIBRARY_DIR}/site-packages/vtk
COMMENT "Copying ${VTK_PY_WRAPPERS_DIR}/site-packages to ${VISIT_LIBRARY_DIR}/site-packages/vtk"
)
ENDIF()
ENDIF (NOT WIN32)
ENDIF(VISIT_PYTHON_FILTERS)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment