healpy setup.py also needs to know where cfitsio is located

This commit is contained in:
Guilhem Lavaux 2012-11-06 15:56:03 -05:00
parent a59b9aae84
commit 058b12bb3f
4 changed files with 6 additions and 2 deletions

View file

@ -253,8 +253,9 @@ ExternalProject_Add(cfitsio
BUILD_IN_SOURCE 1
INSTALL_COMMAND make install
)
SET(CFITSIO_LIBRARY ${CMAKE_BINARY_DIR}/ext_build/cfitsio/lib/libcfitsio.a)
SET(CFITSIO_INCLUDE_PATH ${CMAKE_BINARY_DIR}/ext_build/cfitsio/include)
SET(CFITSIO_PREFIX ${CMAKE_BINARY_DIR}/ext_build/cfitsio)
SET(CFITSIO_LIBRARY ${CFITSIO_PREFIX}/lib/libcfitsio.a)
SET(CFITSIO_INCLUDE_PATH ${CFITSIO_PREFIX}/include)
#################
# Build Healpix

View file

@ -97,6 +97,7 @@ IF(INTERNAL_HEALPY)
"-DPYTHON_CPPFLAGS:STRING=${PYTHON_CPPFLAGS}"
"-DCFITSIO_EXT_LIB=${CFITSIO_LIBRARY}"
"-DCFITSIO_EXT_INC=${CFITSIO_INCLUDE_PATH}"
"-DCFITSIO_EXT_PREFIX=${CFITSIO_PREFIX}"
"-DNETCDF4_DIR=${NETCDF_BIN_DIR}"
"-DPYTHON_LDFLAGS:STRING=${PYTHON_LDFLAGS}"
"-DPYTHON_LOCAL_SITE_PACKAGE=${PYTHON_LOCAL_SITE_PACKAGE}"

View file

@ -6,6 +6,7 @@ SET(ENV{VOID_GSL} ${VOID_GSL})
SET(ENV{PYTHONPATH} ${PYTHON_LOCAL_SITE_PACKAGE}:$ENV{PYTHONPATH})
SET(ENV{CFITSIO_EXT_INC} ${CFITSIO_EXT_INC})
SET(ENV{CFITSIO_EXT_LIB} ${CFITSIO_EXT_LIB})
SET(ENV{CFITSIO_EXT_PREFIX} ${CFITSIO_EXT_PREFIX})
SET(PYTHON_BUILD_COMMAND ${PYTHON_EXECUTABLE} setup.py build)
MESSAGE(STATUS "Running ${PYTHON_BUILD_COMMAND}")

View file

@ -4,6 +4,7 @@ SET(ENV{CPPFLAGS} ${PYTHON_CPPFLAGS})
SET(ENV{LDFLAGS} ${PYTHON_LDFLAGS})
SET(ENV{VOID_GSL} ${VOID_GSL})
SET(ENV{CFITSIO_EXT_INC} ${CFITSIO_EXT_INC})
SET(ENV{CFITSIO_EXT_PREFIX} ${CFITSIO_EXT_PREFIX})
SET(ENV{CFITSIO_EXT_LIB} ${CFITSIO_EXT_LIB})
SET(ENV{PYTHONPATH} ${PYTHON_LOCAL_SITE_PACKAGE}:$ENV{PYTHONPATH})