From 2b807e26bda6648aea6cf57d6ce15d2260ffb339 Mon Sep 17 00:00:00 2001 From: Guilhem Lavaux Date: Tue, 29 Jan 2013 15:09:40 -0500 Subject: [PATCH] Added detection of the support for march=native (solve healpy building issue on old compilers) --- external/external_python_build.cmake | 1 + external/python_build.cmake | 3 +++ 2 files changed, 4 insertions(+) diff --git a/external/external_python_build.cmake b/external/external_python_build.cmake index 6e78b42..ec5c4ee 100644 --- a/external/external_python_build.cmake +++ b/external/external_python_build.cmake @@ -101,6 +101,7 @@ IF(INTERNAL_HEALPY) "-DNETCDF4_DIR=${NETCDF_BIN_DIR}" "-DPYTHON_LDFLAGS:STRING=${PYTHON_LDFLAGS}" "-DPYTHON_LOCAL_SITE_PACKAGE=${PYTHON_LOCAL_SITE_PACKAGE}" + "-DSUPPORT_ARCH_NATIVE=${SUPPORT_ARCH_NATIVE}" "-DTARGET_PATH=${CMAKE_BINARY_DIR}/ext_build/python" "-P") ExternalProject_Add(healpy diff --git a/external/python_build.cmake b/external/python_build.cmake index b834e9b..f733405 100644 --- a/external/python_build.cmake +++ b/external/python_build.cmake @@ -7,6 +7,9 @@ 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}) +IF (NOT SUPPORT_ARCH_NATIVE) + SET(ENV{HEALPY_WITHOUT_NATIVE} 1) +ENDIF(NOT SUPPORT_ARCH_NATIVE) SET(PYTHON_BUILD_COMMAND ${PYTHON_EXECUTABLE} setup.py build) MESSAGE(STATUS "Running ${PYTHON_BUILD_COMMAND}")