guilhem_lavaux/vide_public
0
0
Fork 0
mirror of https://bitbucket.org/cosmicvoids/vide_public.git synced 2025-07-04 15:21:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://bitbucket.org/cosmicvoids/vide_public

Browse source
This commit is contained in:
P.M. Sutter 2014-11-11 11:55:28 -06:00
commit b212ee6dca
3 changed files with 22 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

35
external/external_python_build.cmake vendored
View file

@ -62,14 +62,18 @@ ENDIF(RET_VALUE)
STRING(REGEX REPLACE "(\r?\n)+$" "" PYTHON_LOCAL_SITE_PACKAGE "${PYTHON_LOCAL_SITE_PACKAGE}") STRING(REGEX REPLACE "(\r?\n)+$" "" PYTHON_LOCAL_SITE_PACKAGE "${PYTHON_LOCAL_SITE_PACKAGE}")
MESSAGE(STATUS "Python is installing its packages in ${PYTHON_LOCAL_SITE_PACKAGE}") MESSAGE(STATUS "Python is installing its packages in ${PYTHON_LOCAL_SITE_PACKAGE}")
SET(BASIC_PYTHON_ENV "-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} "
"-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}"
"-DPYTHON_EXECUTABLE=${PYTHON_EXECUTABLE}"
"-DPYTHON_LOCAL_SITE_PACKAGE=${PYTHON_LOCAL_SITE_PACKAGE}"
"-DTARGET_PATH=${CMAKE_BINARY_DIR}/ext_build/python")
IF(INTERNAL_CYTHON) IF(INTERNAL_CYTHON)
SET(BUILD_ENVIRONMENT SET(BUILD_ENVIRONMENT
${CMAKE_COMMAND} ${CMAKE_COMMAND}
"-DPYTHON_EXECUTABLE=${PYTHON_EXECUTABLE}" ${BASIC_PYTHON_ENV}
"-DPYTHON_LOCAL_SITE_PACKAGE=${PYTHON_LOCAL_SITE_PACKAGE}" "-P")
"-DTARGET_PATH=${CMAKE_BINARY_DIR}/ext_build/python" "-P")
ExternalProject_Add(cython ExternalProject_Add(cython
DEPENDS ${PREV_PYTHON_BUILD} DEPENDS ${PREV_PYTHON_BUILD}
URL ${CYTHON_URL} URL ${CYTHON_URL}
@ -88,13 +92,12 @@ IF(INTERNAL_NETCDF4_PYTHON)
SET(PYTHON_LDFLAGS -L${NETCDF_BIN_DIR}/lib) SET(PYTHON_LDFLAGS -L${NETCDF_BIN_DIR}/lib)
SET(BUILD_ENVIRONMENT SET(BUILD_ENVIRONMENT
${CMAKE_COMMAND} ${CMAKE_COMMAND}
"-DPYTHON_EXECUTABLE=${PYTHON_EXECUTABLE}" ${BASIC_PYTHON_ENV}
"-DPYTHON_CPPFLAGS:STRING=${PYTHON_CPPFLAGS}" "-DPYTHON_CPPFLAGS:STRING=${PYTHON_CPPFLAGS}"
"-DHDF5_DIR=${HDF5_BIN_DIR}" "-DHDF5_DIR=${HDF5_BIN_DIR}"
"-DNETCDF4_DIR=${NETCDF_BIN_DIR}" "-DNETCDF4_DIR=${NETCDF_BIN_DIR}"
"-DPYTHON_LDFLAGS:STRING=${PYTHON_LDFLAGS}" "-DPYTHON_LDFLAGS:STRING=${PYTHON_LDFLAGS}"
"-DPYTHON_LOCAL_SITE_PACKAGE=${PYTHON_LOCAL_SITE_PACKAGE}" "-P")
"-DTARGET_PATH=${CMAKE_BINARY_DIR}/ext_build/python" "-P")
ExternalProject_Add(netcdf4-python ExternalProject_Add(netcdf4-python
DEPENDS ${PREV_PYTHON_BUILD} netcdf DEPENDS ${PREV_PYTHON_BUILD} netcdf
@ -111,16 +114,15 @@ ENDIF(INTERNAL_NETCDF4_PYTHON)
IF(INTERNAL_HEALPY) IF(INTERNAL_HEALPY)
SET(BUILD_ENVIRONMENT SET(BUILD_ENVIRONMENT
${CMAKE_COMMAND} ${CMAKE_COMMAND}
"-DPYTHON_EXECUTABLE=${PYTHON_EXECUTABLE}" ${BASIC_PYTHON_ENV}
"-DPYTHON_CPPFLAGS:STRING=${PYTHON_CPPFLAGS}" "-DPYTHON_CPPFLAGS:STRING=${PYTHON_CPPFLAGS}"
"-DCFITSIO_EXT_LIB=${CFITSIO_LIBRARY}" "-DCFITSIO_EXT_LIB=${CFITSIO_LIBRARY}"
"-DCFITSIO_EXT_INC=${CFITSIO_INCLUDE_PATH}" "-DCFITSIO_EXT_INC=${CFITSIO_INCLUDE_PATH}"
"-DCFITSIO_EXT_PREFIX=${CFITSIO_PREFIX}" "-DCFITSIO_EXT_PREFIX=${CFITSIO_PREFIX}"
"-DNETCDF4_DIR=${NETCDF_BIN_DIR}" "-DNETCDF4_DIR=${NETCDF_BIN_DIR}"
"-DPYTHON_LDFLAGS:STRING=${PYTHON_LDFLAGS}" "-DPYTHON_LDFLAGS:STRING=${PYTHON_LDFLAGS}"
"-DPYTHON_LOCAL_SITE_PACKAGE=${PYTHON_LOCAL_SITE_PACKAGE}"
"-DSUPPORT_ARCH_NATIVE=${SUPPORT_ARCH_NATIVE}" "-DSUPPORT_ARCH_NATIVE=${SUPPORT_ARCH_NATIVE}"
"-DTARGET_PATH=${CMAKE_BINARY_DIR}/ext_build/python" "-P") "-P")
ExternalProject_Add(healpy ExternalProject_Add(healpy
DEPENDS ${PREV_PYTHON_BUILD} DEPENDS ${PREV_PYTHON_BUILD}
@ -136,9 +138,8 @@ ENDIF(INTERNAL_HEALPY)
IF(INTERNAL_SETUPTOOLS) IF(INTERNAL_SETUPTOOLS)
SET(BUILD_ENVIRONMENT SET(BUILD_ENVIRONMENT
${CMAKE_COMMAND} ${CMAKE_COMMAND}
"-DPYTHON_EXECUTABLE=${PYTHON_EXECUTABLE}" ${BASIC_PYTHON_ENV}
"-DPYTHON_LOCAL_SITE_PACKAGE=${PYTHON_LOCAL_SITE_PACKAGE}" "-P")
"-DTARGET_PATH=${CMAKE_BINARY_DIR}/ext_build/python" "-P")
ExternalProject_Add(setuptools ExternalProject_Add(setuptools
URL ${SETUPTOOLS_URL} URL ${SETUPTOOLS_URL}
@ -168,9 +169,8 @@ ENDIF(INTERNAL_ARGPARSE)
IF(INTERNAL_SCIPY) IF(INTERNAL_SCIPY)
SET(BUILD_ENVIRONMENT SET(BUILD_ENVIRONMENT
${CMAKE_COMMAND} ${CMAKE_COMMAND}
"-DPYTHON_EXECUTABLE=${PYTHON_EXECUTABLE}" ${BASIC_PYTHON_ENV}
"-DPYTHON_LOCAL_SITE_PACKAGE=${PYTHON_LOCAL_SITE_PACKAGE}" "-P")
"-DTARGET_PATH=${CMAKE_BINARY_DIR}/ext_build/python" "-P")
ExternalProject_Add(scipy ExternalProject_Add(scipy
DEPENDS ${PREV_PYTHON_BUILD} DEPENDS ${PREV_PYTHON_BUILD}
@ -187,9 +187,8 @@ ENDIF(INTERNAL_SCIPY)
IF(INTERNAL_KDTREE_SCIPY) IF(INTERNAL_KDTREE_SCIPY)
SET(BUILD_ENVIRONMENT SET(BUILD_ENVIRONMENT
${CMAKE_COMMAND} ${CMAKE_COMMAND}
"-DPYTHON_EXECUTABLE=${PYTHON_EXECUTABLE}" ${BASIC_PYTHON_ENV}
"-DPYTHON_LOCAL_SITE_PACKAGE=${PYTHON_LOCAL_SITE_PACKAGE}" "-P")
"-DTARGET_PATH=${CMAKE_BINARY_DIR}/ext_build/python" "-P")
ExternalProject_Add(kdtree-scipy ExternalProject_Add(kdtree-scipy
DEPENDS ${PREV_PYTHON_BUILD} DEPENDS ${PREV_PYTHON_BUILD}

2
external/python_build.cmake vendored
View file

@ -7,6 +7,8 @@ SET(ENV{PYTHONPATH} ${PYTHON_LOCAL_SITE_PACKAGE}:$ENV{PYTHONPATH})
SET(ENV{CFITSIO_EXT_INC} ${CFITSIO_EXT_INC}) SET(ENV{CFITSIO_EXT_INC} ${CFITSIO_EXT_INC})
SET(ENV{CFITSIO_EXT_LIB} ${CFITSIO_EXT_LIB}) SET(ENV{CFITSIO_EXT_LIB} ${CFITSIO_EXT_LIB})
SET(ENV{CFITSIO_EXT_PREFIX} ${CFITSIO_EXT_PREFIX}) SET(ENV{CFITSIO_EXT_PREFIX} ${CFITSIO_EXT_PREFIX})
SET(ENV{CC} ${CMAKE_C_COMPILER})
SET(ENV{CXX} ${CMAKE_CXX_COMPILER})
IF (NOT SUPPORT_ARCH_NATIVE) IF (NOT SUPPORT_ARCH_NATIVE)
SET(ENV{HEALPY_WITHOUT_NATIVE} 1) SET(ENV{HEALPY_WITHOUT_NATIVE} 1)
ENDIF(NOT SUPPORT_ARCH_NATIVE) ENDIF(NOT SUPPORT_ARCH_NATIVE)

3
external/python_install.cmake vendored
View file

@ -7,6 +7,9 @@ SET(ENV{CFITSIO_EXT_INC} ${CFITSIO_EXT_INC})
SET(ENV{CFITSIO_EXT_PREFIX} ${CFITSIO_EXT_PREFIX}) SET(ENV{CFITSIO_EXT_PREFIX} ${CFITSIO_EXT_PREFIX})
SET(ENV{CFITSIO_EXT_LIB} ${CFITSIO_EXT_LIB}) SET(ENV{CFITSIO_EXT_LIB} ${CFITSIO_EXT_LIB})
SET(ENV{PYTHONPATH} ${PYTHON_LOCAL_SITE_PACKAGE}:$ENV{PYTHONPATH}) SET(ENV{PYTHONPATH} ${PYTHON_LOCAL_SITE_PACKAGE}:$ENV{PYTHONPATH})
SET(ENV{CC} ${CMAKE_C_COMPILER})
SET(ENV{CXX} ${CMAKE_CXX_COMPILER})
SET(PYTHON_INSTALL_COMMAND ${PYTHON_EXECUTABLE} setup.py install --prefix=${TARGET_PATH} --install-lib=${PYTHON_LOCAL_SITE_PACKAGE}) SET(PYTHON_INSTALL_COMMAND ${PYTHON_EXECUTABLE} setup.py install --prefix=${TARGET_PATH} --install-lib=${PYTHON_LOCAL_SITE_PACKAGE})