Commit 3d311645 authored by Ben Boeckel's avatar Ben Boeckel

smtk: fix python module paths

parent 92837883
......@@ -8,10 +8,10 @@ file(MAKE_DIRECTORY "${TMP_DIR}/SMTKPlugin")
set(plugin_install_dir ${INSTALL_DIR}/Applications/ModelBuilder.app/Contents/Python/smtk)
file(MAKE_DIRECTORY "${plugin_install_dir}")
set(py_files_libs ${SMTK_BIN_DIR}/lib/SMTKCorePython.so
set(py_files_libs ${SMTK_BIN_DIR}/lib/python${PYTHON_VERSION}/site-packages/smtk/SMTKCorePython.so
${SMTK_BIN_DIR}/lib/libshiboken-python${PYTHON_VERSION}.1.2.dylib
${SMTK_BIN_DIR}/lib/python${PYTHON_VERSION}/site-packages/shiboken.so
${SMTK_BIN_DIR}/libexec/python/site-packages/smtk/simple.py)
${SMTK_BIN_DIR}/lib/python${PYTHON_VERSION}/site-packages/smtk/simple.py)
foreach(lib IN LISTS py_files_libs)
configure_file(
"${lib}"
......@@ -29,7 +29,7 @@ execute_process(
execute_process(
COMMAND ${CMAKE_CURRENT_LIST_DIR}/../remove_code.py
${SMTK_BIN_DIR}/libexec/python/site-packages/smtk/__init__.py
${SMTK_BIN_DIR}/lib/python${PYTHON_VERSION}/site-packages/smtk/__init__.py
${TMP_DIR}/SMTKPlugin/__init__.py
)
......
......@@ -27,12 +27,12 @@ set(plugin_install_dir ${SMTK_BIN_DIR}/${PYTHON_INSTALL}/smtk)
file(MAKE_DIRECTORY "${plugin_install_dir}")
if (UNIX)
set(PYTHON_COPY_SOURCE_LOC ${CMAKE_INSTALL_LIBEXECDIR}/python/site-packages)
set(PYTHON_COPY_SOURCE_LOC lib/python2.7/site-packages)
elseif (WIN32)
set(PYTHON_COPY_SOURCE_LOC bin/Lib/site-packages)
endif()
set(py_files_libs ${SMTK_BIN_DIR}/lib/smtkCorePython.${SHARED_LIBRARY_SUFFIX}
set(py_files_libs ${SMTK_BIN_DIR}/${PYTHON_SITE}/smtk/smtkCorePython.${SHARED_LIBRARY_SUFFIX}
${SMTK_BIN_DIR}/${LIB_SHIBOKEN_PY}
${SMTK_BIN_DIR}/${PYTHON_SITE}/shiboken.${SHARED_LIBRARY_SUFFIX}
${SMTK_BIN_DIR}/${PYTHON_COPY_SOURCE_LOC}/smtk/simple.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