Skip to content

Commit

Permalink
move to SIRF/setup_py
Browse files Browse the repository at this point in the history
  • Loading branch information
casperdcl committed Apr 27, 2018
1 parent 700d8cb commit eeecb47
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 101 deletions.
12 changes: 2 additions & 10 deletions SuperBuild.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -179,17 +179,11 @@ set(CCPPETMR_INSTALL ${SUPERBUILD_INSTALL_DIR})
## in the env_ccppetmr scripts we perform a substitution of the whole block
## during the configure_file() command call below.

## Note that the MATLAB_DEST and PYTHON_DEST variables are currently set
## in External_SIRF.cmake. That's a bit confusing of course (TODO).
## Note that the (MATLAB|PYTHON)_DEST and PYTHON_STRATEGY variables are
## currently set in External_SIRF.cmake. That's a bit confusing of course (TODO).
set(ENV_PYTHON_BASH "##### Python not found #####")
set(ENV_PYTHON_CSH "##### Python not found #####")
if(PYTHONINTERP_FOUND)
set(PYTHON_STRATEGY "PYTHONPATH" CACHE STRING "\
PYTHONPATH: prefix PYTHONPATH \n\
SETUP_PY: execute ${PYTHON_EXECUTABLE} setup.py install \n\
CONDA: do nothing")
set_property(CACHE PYTHON_STRATEGY PROPERTY STRINGS PYTHONPATH SETUP_PY CONDA)

if("${PYTHON_STRATEGY}" STREQUAL "PYTHONPATH")
set(COMMENT_OUT_PREFIX "")
else()
Expand Down Expand Up @@ -228,8 +222,6 @@ 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)

include("${CMAKE_CURRENT_SOURCE_DIR}/setup.py.cmake")

# add tests
enable_testing()
add_test(NAME SIRF_TESTS
Expand Down
8 changes: 7 additions & 1 deletion SuperBuild/External_SIRF.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@ if(NOT ( DEFINED "USE_SYSTEM_${externalProjName}" AND "${USE_SYSTEM_${externalPr
set (BUILD_PYTHON ${PYTHONLIBS_FOUND})
if (BUILD_PYTHON)
set(PYTHON_DEST "${SIRF_Install_Dir}/python" CACHE PATH "Destination for python modules")
set(PYTHON_STRATEGY "PYTHONPATH" CACHE STRING "\
PYTHONPATH: prefix PYTHONPATH \n\
SETUP_PY: execute ${PYTHON_EXECUTABLE} setup.py install \n\
CONDA: do nothing")
set_property(CACHE PYTHON_STRATEGY PROPERTY STRINGS PYTHONPATH SETUP_PY CONDA)
endif()
set (BUILD_MATLAB ${Matlab_FOUND})
if (BUILD_MATLAB)
Expand Down Expand Up @@ -87,7 +92,8 @@ if(NOT ( DEFINED "USE_SYSTEM_${externalProjName}" AND "${USE_SYSTEM_${externalPr
-DPYTHON_EXECUTABLE=${PYTHON_EXECUTABLE}
-DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDE_DIRS}
-DPYTHON_LIBRARY=${PYTHON_LIBRARIES}
-DPYTHON_DEST=${PYTHON_DEST}/sirf
-DPYTHON_DEST=${PYTHON_DEST}
-DPYTHON_STRATEGY=${PYTHON_STRATEGY}
INSTALL_DIR ${SIRF_Install_Dir}
DEPENDS
${${proj}_DEPENDENCIES}
Expand Down
1 change: 0 additions & 1 deletion cmake/__init__.py.in

This file was deleted.

40 changes: 0 additions & 40 deletions cmake/setup.py.in

This file was deleted.

49 changes: 0 additions & 49 deletions setup.py.cmake

This file was deleted.

0 comments on commit eeecb47

Please sign in to comment.