From 058b12bb3f52cd182c3d395e48f705cf29cc95e8 Mon Sep 17 00:00:00 2001 From: Guilhem Lavaux Date: Tue, 6 Nov 2012 15:56:03 -0500 Subject: [PATCH] healpy setup.py also needs to know where cfitsio is located --- external/external_build.cmake | 5 +++-- external/external_python_build.cmake | 1 + external/python_build.cmake | 1 + external/python_install.cmake | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/external/external_build.cmake b/external/external_build.cmake index fd407e4..8835789 100644 --- a/external/external_build.cmake +++ b/external/external_build.cmake @@ -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 diff --git a/external/external_python_build.cmake b/external/external_python_build.cmake index d6b0a2f..6e78b42 100644 --- a/external/external_python_build.cmake +++ b/external/external_python_build.cmake @@ -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}" diff --git a/external/python_build.cmake b/external/python_build.cmake index ca9970e..b834e9b 100644 --- a/external/python_build.cmake +++ b/external/python_build.cmake @@ -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}") diff --git a/external/python_install.cmake b/external/python_install.cmake index e33e377..ee04a3c 100644 --- a/external/python_install.cmake +++ b/external/python_install.cmake @@ -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})