Add PythonInterface/PythonAlgorithms as target. Refs #6207

mantidproject · Nov 22, 2012 · a8b877e · a8b877e
1 parent d78fa32
commit a8b877e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/Code/Mantid/Framework/PythonAPI/CMakeLists.txt b/Code/Mantid/Framework/PythonAPI/CMakeLists.txt
@@ -91,14 +91,14 @@ include_directories ( inc )
 copy_python_files_to_dir( "${PY_FILES}" ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR} PYTHON_INSTALL_FILES )
 
 # Python algorithms
-add_compile_py_target( PythonAlgorithms ${CMAKE_CURRENT_SOURCE_DIR}/PythonAlgorithms )
+add_compile_py_target( PythonAlgorithmsOld ${CMAKE_CURRENT_SOURCE_DIR}/PythonAlgorithms )
 
 ###########################################################################
 # Create the target for this directory
 ###########################################################################
 
 add_library ( PythonAPI ${SRC_FILES} ${INC_FILES} ${BOOST_SRC} ${PYTHON_INSTALL_FILES} )
-add_dependencies( PythonAPI PythonAlgorithms )
+add_dependencies( PythonAPI PythonAlgorithmsOld )
 if ( UNIX )
   set ( DLOPEN_SRC src/dlopen.c )
   add_library ( dlopen ${DLOPEN_SRC} )

diff --git a/Code/Mantid/Framework/PythonInterface/CMakeLists.txt b/Code/Mantid/Framework/PythonInterface/CMakeLists.txt
@@ -52,6 +52,12 @@ endif ()
 ###########################################################################
 add_subdirectory ( mantid )
 
+###########################################################################
+# Python algorithms
+###########################################################################
+add_compile_py_target( PythonAlgorithms ${CMAKE_CURRENT_SOURCE_DIR}/PythonAlgorithms )
+add_dependencies( PythonAPIModule PythonAlgorithms )
+
 ###########################################################################
 # tests 
 ###########################################################################
@@ -176,3 +182,7 @@ endif ()
 install ( DIRECTORY mantid DESTINATION ${BIN_DIR} 
           FILES_MATCHING REGEX ".*.pyc?$"
           PATTERN "src" EXCLUDE )
+
+# Python algorithms
+install ( DIRECTORY PythonAlgorithms/ DESTINATION ${PLUGINS_DIR}/PythonAlgs
+                                      PATTERN ".svn" EXCLUDE )