Skip to content

Commit

Permalink
backward-compatible setup.py
Browse files Browse the repository at this point in the history
- depends on SyneRBI/SIRF#160
- fixes #107
  • Loading branch information
casperdcl committed Apr 19, 2018
1 parent 8f8b09a commit 011a83a
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 5 deletions.
32 changes: 28 additions & 4 deletions SuperBuild.cmake
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#========================================================================
# Author: Benjamin A Thomas
# Author: Edoardo Pasca
# Author: Casper da Costa-Luis
# Copyright 2017 University College London
# Copyright 2017 Science Technology Facilities Council
#
Expand Down Expand Up @@ -217,25 +218,48 @@ endif()
configure_file(env_ccppetmr.sh.in ${CCPPETMR_INSTALL}/bin/env_ccppetmr.sh)
configure_file(env_ccppetmr.csh.in ${CCPPETMR_INSTALL}/bin/env_ccppetmr.csh)

# Install python packages via pip and setup.py
if(PYTHONINTERP_FOUND)
set(PYTHON_SETUP_PKGS "sirf" CACHE INTERNAL "list of provided python packages")

# alias sirf.p* -> p* for backward-compatibility
function(python_pkg_alias PY_PKG_NEW PY_PKG_OLD)
list(APPEND PYTHON_SETUP_PKGS ${PY_PKG_NEW})
set(PYTHON_SETUP_PKGS "${PYTHON_SETUP_PKGS}" PARENT_SCOPE)
set(SETUP_PY_INIT_IN "${CMAKE_CURRENT_SOURCE_DIR}/SuperBuild/__init__.py.in")
set(SETUP_PY_INIT "${PYTHON_DEST}/${PY_PKG_NEW}/__init__.py")
configure_file("${SETUP_PY_INIT_IN}" "${SETUP_PY_INIT}")
# message(STATUS "setup.py:${SETUP_PY_INIT}")
message(STATUS "setup.py:${PY_PKG_NEW}<-${PY_PKG_OLD}")
endfunction(python_pkg_alias)
python_pkg_alias(pGadgetron "sirf.pGadgetron")
python_pkg_alias(pSTIR "sirf.pSTIR")
python_pkg_alias(pUtilities "sirf.pUtilities")
# convert to python CSV tuple for setup.py configure_file
string(REPLACE ";" "', '" PYTHON_SETUP_PKGS_CSV "${PYTHON_SETUP_PKGS}")
set(PYTHON_SETUP_PKGS_CSV "'${PYTHON_SETUP_PKGS_CSV}'")
# message(STATUS "setup.py:pacakges:${PYTHON_SETUP_PKGS_CSV}")

# Create setup.py
set(SETUP_PY_IN "${CMAKE_CURRENT_SOURCE_DIR}/SuperBuild/setup.py.in")
set(SETUP_PY "${PYTHON_DEST}/setup.py")
set(SETUP_PY_INIT "${PYTHON_DEST}/sirf/__init__.py")
message(STATUS "setup.py: ${SETUP_PY}")

message(STATUS "setup.py:${SETUP_PY}")
configure_file("${SETUP_PY_IN}" "${SETUP_PY}")

# pip install -e
add_custom_command(OUTPUT "${SETUP_PY_INIT}"
COMMAND "${CMAKE_COMMAND}" -E make_directory "${PYTHON_DEST}/sirf"
COMMAND "${CMAKE_COMMAND}" -E touch "${SETUP_PY_INIT}"
COMMAND "${PYTHON_EXECUTABLE}" setup.py build
DEPENDS "${SETUP_PY_IN}"
WORKING_DIRECTORY "${PYTHON_DEST}")

add_custom_target(pybuild_stir ALL DEPENDS ${SETUP_PY_INIT})
add_custom_target(pybuild_sirf ALL DEPENDS ${SETUP_PY_INIT})

# N.B. `-e` picks up cythonised libraries without messing with LD_LIBRARY_PATH
install(CODE "execute_process(COMMAND\n\
\"${PYTHON_EXECUTABLE}\" -m pip install -U -e \"${CCPPETMR_INSTALL}\")")
\"${PYTHON_EXECUTABLE}\" -m pip install -U -e \"${PYTHON_DEST}\")")
endif(PYTHONINTERP_FOUND)


Expand Down
1 change: 1 addition & 0 deletions SuperBuild/__init__.py.in
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from ${PY_PKG_OLD} import *
2 changes: 1 addition & 1 deletion SuperBuild/setup.py.in
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ setup(
author_email='ccppetmr@stfc.ac.uk',
url='https://github.com/CCPPETMR/SIRF',
platforms=['any'],
packages=['sirf'],
packages=[${PYTHON_SETUP_PKGS_CSV}],
long_description='',
classifiers=[
# Trove classifiers
Expand Down

0 comments on commit 011a83a

Please sign in to comment.