move to SIRF/setup_py

SuperBuild.cmake

@@ -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()
@@ -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

SuperBuild/External_SIRF.cmake

@@ -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)
@@ -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}