Commit 37389e50 authored by Yumin Yuan's avatar Yumin Yuan Committed by Kitware Robot

Merge topic 'fix-smtk-install'

03e5c72a Set variables so linux and win32 copy from seperate places
28b15e01 Fix simple.py copy source location
1ab2256a Revert python copy source location
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !52
parents bf2152cf 03e5c72a
......@@ -26,17 +26,23 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${TMP_DIR}/SMTKPlugin
set(plugin_install_dir ${SMTK_BIN_DIR}/${PYTHON_INSTALL}/smtk)
execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${plugin_install_dir})
if (UNIX)
set(PYTHON_COPY_SOURCE_LOC ${CMAKE_INSTALL_LIBEXECDIR}/python/site-packages)
elseif (WIN32)
set(PYTHON_COPY_SOURCE_LOC python)
endif()
set(py_files_libs ${SMTK_BIN_DIR}/lib/smtkCorePython.${SHARED_LIBRARY_SUFFIX}
${SMTK_BIN_DIR}/${LIB_SHIBOKEN_PY}
${SMTK_BIN_DIR}/${PYTHON_SITE}/shiboken.${SHARED_LIBRARY_SUFFIX}
${SMTK_BIN_DIR}/python/smtk/simple.py)
${SMTK_BIN_DIR}/${PYTHON_COPY_SOURCE_LOC}/smtk/simple.py)
foreach(lib ${py_files_libs})
execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${lib} ${TMP_DIR}/SMTKPlugin)
endforeach()
execute_process(
COMMAND ${pv_python_executable} ${CMAKE_CURRENT_LIST_DIR}/remove_code.py
${SMTK_BIN_DIR}/python/smtk/__init__.py
${SMTK_BIN_DIR}/${PYTHON_COPY_SOURCE_LOC}/smtk/__init__.py
${TMP_DIR}/SMTKPlugin/__init__.py
)
......
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