Fix python install file lists Refs #5192

Also only ship the pyd files for windows.
mantidproject · Aug 17, 2012 · c503a8a · c503a8a
1 parent d6ada8c
commit c503a8a
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/Code/Mantid/Framework/PythonAPI/CMakeLists.txt b/Code/Mantid/Framework/PythonAPI/CMakeLists.txt
@@ -256,7 +256,7 @@ endif ()
 ###########################################################################
 # Ship .py & .pyc files
 ###########################################################################
-install_python_files ( ${CMAKE_CURRENT_SOURCE_DIR} ${PY_FILES} ${BIN_DIR} )
+install_python_files ( ${CMAKE_CURRENT_SOURCE_DIR} "${PY_FILES}" ${BIN_DIR} )
 
 install ( DIRECTORY PythonAlgorithms/ DESTINATION ${PLUGINS_DIR}/PythonAlgs
                                       PATTERN ".svn" EXCLUDE )
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/CMakeLists.txt b/Code/Mantid/Framework/PythonInterface/mantid/api/CMakeLists.txt
@@ -103,4 +103,4 @@ target_link_libraries ( PythonAPIModule PythonGeometryModule PythonKernelModule
 ###########################################################################
 # Installation settings
 ###########################################################################
-install ( TARGETS PythonAPIModule DESTINATION ${BIN_DIR}/mantid/api )
+install ( TARGETS PythonAPIModule ${SYSTEM_PACKAGE_TARGET} DESTINATION ${BIN_DIR}/mantid/api )
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/geometry/CMakeLists.txt b/Code/Mantid/Framework/PythonInterface/mantid/geometry/CMakeLists.txt
@@ -61,5 +61,5 @@ target_link_libraries ( PythonGeometryModule PythonKernelModule ${PYTHON_DEPS} )
 ###########################################################################
 # Installation settings
 ###########################################################################
-install ( TARGETS PythonGeometryModule DESTINATION ${BIN_DIR}/mantid/geometry )
+install ( TARGETS PythonGeometryModule ${SYSTEM_PACKAGE_TARGET} DESTINATION ${BIN_DIR}/mantid/geometry )
 
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/CMakeLists.txt b/Code/Mantid/Framework/PythonInterface/mantid/kernel/CMakeLists.txt
@@ -139,7 +139,7 @@ endif()
 ###########################################################################
 # Installation settings
 ###########################################################################
-install ( TARGETS PythonKernelModule DESTINATION ${BIN_DIR}/mantid/kernel )
+install ( TARGETS PythonKernelModule ${SYSTEM_PACKAGE_TARGET} DESTINATION ${BIN_DIR}/mantid/kernel )
 if ( UNIX )
 install ( TARGETS _dlopen DESTINATION ${BIN_DIR}/mantid/kernel )
 endif()

diff --git a/Code/Mantid/MantidPlot/CMakeLists.txt b/Code/Mantid/MantidPlot/CMakeLists.txt
@@ -922,9 +922,9 @@ install ( TARGETS MantidPlot RUNTIME DESTINATION ${BIN_DIR}
                              BUNDLE DESTINATION .
 )
 
-INSTALL_PYTHON_FILES ( ${CMAKE_CURRENT_SOURCE_DIR} ${PY_FILES} ${BIN_DIR} )
-INSTALL_PYTHON_FILES ( ${CMAKE_CURRENT_SOURCE_DIR}/mantidplotpy ${MTDPLOTPY_FILES} ${BIN_DIR}/mantidplotpy )
-INSTALL_PYTHON_FILES ( ${CMAKE_CURRENT_SOURCE_DIR}/ipython_plugin ${IPY_FILES} ${BIN_DIR}/ipython_plugin )
+INSTALL_PYTHON_FILES ( ${CMAKE_CURRENT_SOURCE_DIR} "${PY_FILES}" ${BIN_DIR} )
+INSTALL_PYTHON_FILES ( ${CMAKE_CURRENT_SOURCE_DIR}/mantidplotpy "${MTDPLOTPY_FILES}" ${BIN_DIR}/mantidplotpy )
+INSTALL_PYTHON_FILES ( ${CMAKE_CURRENT_SOURCE_DIR}/ipython_plugin "${IPY_FILES}" ${BIN_DIR}/ipython_plugin )
 
 if ( APPLE )
   configure_file ( ${CMAKE_CURRENT_SOURCE_DIR}/FixBundle.cmake.in