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

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

Browse source
This commit is contained in:
Guilhem Lavaux 2012-11-05 17:30:52 -05:00
commit de9797d6df
4 changed files with 33 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

26
external/external_build.cmake vendored
View file

@ -87,7 +87,11 @@ if (INTERNAL_HDF5)
ExternalProject_Add(hdf5 ExternalProject_Add(hdf5
PREFIX ${BUILD_PREFIX}/hdf5-prefix PREFIX ${BUILD_PREFIX}/hdf5-prefix
URL ${HDF5_URL} URL ${HDF5_URL}
CONFIGURE_COMMAND ${HDF5_SOURCE_DIR}/configure --disable-shared --enable-cxx --with-pic --prefix=${HDF5_BIN_DIR} CPPFLAGS=${CONFIGURE_CPP_FLAGS} CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} CONFIGURE_COMMAND ${HDF5_SOURCE_DIR}/configure
--disable-shared --enable-cxx --with-pic
--prefix=${HDF5_BIN_DIR} --libdir=${HDF5_BIN_DIR}/lib
CPPFLAGS=${CONFIGURE_CPP_FLAGS} CC=${CMAKE_C_COMPILER}
CXX=${CMAKE_CXX_COMPILER}
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
INSTALL_COMMAND make install INSTALL_COMMAND make install
) )
@ -125,7 +129,12 @@ if (INTERNAL_NETCDF)
DEPENDS ${hdf5_built} DEPENDS ${hdf5_built}
PREFIX ${BUILD_PREFIX}/netcdf-prefix PREFIX ${BUILD_PREFIX}/netcdf-prefix
URL ${NETCDF_URL} URL ${NETCDF_URL}
CONFIGURE_COMMAND ${NETCDF_SOURCE_DIR}/configure --prefix=${NETCDF_BIN_DIR} --enable-netcdf-4 --with-pic --disable-shared --disable-dap --disable-cdmremote --disable-rpc --disable-examples ${EXTRA_NC_FLAGS} CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} CONFIGURE_COMMAND ${NETCDF_SOURCE_DIR}/configure
--prefix=${NETCDF_BIN_DIR} --libdir=${NETCDF_BIN_DIR}/lib
--enable-netcdf-4 --with-pic --disable-shared --disable-dap
--disable-cdmremote --disable-rpc
--disable-examples ${EXTRA_NC_FLAGS} CC=${CMAKE_C_COMPILER}
CXX=${CMAKE_CXX_COMPILER}
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
INSTALL_COMMAND make install INSTALL_COMMAND make install
) )
@ -142,7 +151,8 @@ ELSE(INTERNAL_NETCDF)
find_library(NETCDFCPP_LIBRARY netcdf_c++) find_library(NETCDFCPP_LIBRARY netcdf_c++)
find_path(NETCDF_INCLUDE_PATH NAMES netcdf.h) find_path(NETCDF_INCLUDE_PATH NAMES netcdf.h)
find_path(NETCDFCPP_INCLUDE_PATH NAMES netcdf) find_path(NETCDFCPP_INCLUDE_PATH NAMES netcdf)
SET(CONFIGURE_CPP_FLAGS ${CONFIGURE_CPP_FLAGS} -I${NETCDF_INCLUDE_PATH} -I${NETCDFCPP_INCLUDE_PATH}) SET(CONFIGURE_CPP_FLAGS ${CONFIGURE_CPP_FLAGS}
-I${NETCDF_INCLUDE_PATH} -I${NETCDFCPP_INCLUDE_PATH})
endif (INTERNAL_NETCDF) endif (INTERNAL_NETCDF)
################## ##################
@ -154,7 +164,8 @@ if (INTERNAL_BOOST)
ExternalProject_Add(boost ExternalProject_Add(boost
URL ${BOOST_URL} URL ${BOOST_URL}
PREFIX ${BUILD_PREFIX}/boost-prefix PREFIX ${BUILD_PREFIX}/boost-prefix
CONFIGURE_COMMAND ${BOOST_SOURCE_DIR}/bootstrap.sh --prefix=${CMAKE_BINARY_DIR}/ext_build/boost CONFIGURE_COMMAND
${BOOST_SOURCE_DIR}/bootstrap.sh --prefix=${CMAKE_BINARY_DIR}/ext_build/boost
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
BUILD_COMMAND ${BOOST_SOURCE_DIR}/b2 --with-exception --with-python BUILD_COMMAND ${BOOST_SOURCE_DIR}/b2 --with-exception --with-python
INSTALL_COMMAND echo "No install" INSTALL_COMMAND echo "No install"
@ -172,7 +183,10 @@ IF(INTERNAL_GSL)
ExternalProject_Add(gsl ExternalProject_Add(gsl
URL ${GSL_URL} URL ${GSL_URL}
PREFIX ${BUILD_PREFIX}/gsl-prefix PREFIX ${BUILD_PREFIX}/gsl-prefix
CONFIGURE_COMMAND ${GSL_SOURCE_DIR}/configure --prefix=${CMAKE_BINARY_DIR}/ext_build/gsl --disable-shared --with-pic CPPFLAGS=${CONFIGURE_CPP_FLAGS} CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} CONFIGURE_COMMAND ${GSL_SOURCE_DIR}/configure
--prefix=${CMAKE_BINARY_DIR}/ext_build/gsl --disable-shared
--with-pic --libdir=${CMAKE_BINARY_DIR}/ext_build/gsl/lib
CPPFLAGS=${CONFIGURE_CPP_FLAGS} CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER}
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
BUILD_COMMAND make BUILD_COMMAND make
INSTALL_COMMAND make install INSTALL_COMMAND make install
@ -220,7 +234,7 @@ ExternalProject_Add(cfitsio
PREFIX ${BUILD_PREFIX}/cfitsio-prefix PREFIX ${BUILD_PREFIX}/cfitsio-prefix
CONFIGURE_COMMAND CONFIGURE_COMMAND
${CMAKE_SOURCE_DIR}/external/cfitsio/configure ${CMAKE_SOURCE_DIR}/external/cfitsio/configure
--prefix=${CMAKE_BINARY_DIR}/ext_build/cfitsio --prefix=${CMAKE_BINARY_DIR}/ext_build/cfitsio --libdir=${CMAKE_BINARY_DIR}/ext_build/cfitsio/lib
CPPFLAGS=${CONFIGURE_CPP_FLAGS} CPPFLAGS=${CONFIGURE_CPP_FLAGS}
CC=${CMAKE_C_COMPILER} CC=${CMAKE_C_COMPILER}
CXX=${CMAKE_CXX_COMPILER} CXX=${CMAKE_CXX_COMPILER}

9
external/external_python_build.cmake vendored
View file

@ -27,14 +27,19 @@ MESSAGE(STATUS "Python is installing its packages in ${PYTHON_LOCAL_SITE_PACKAGE
IF(INTERNAL_CYTHON) IF(INTERNAL_CYTHON)
SET(BUILD_ENVIRONMENT
${CMAKE_COMMAND}
"-DPYTHON_EXECUTABLE=${PYTHON_EXECUTABLE}"
"-DPYTHON_LOCAL_SITE_PACKAGE=${PYTHON_LOCAL_SITE_PACKAGE}"
"-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}
PREFIX ${BUILD_PREFIX}/cython-prefix PREFIX ${BUILD_PREFIX}/cython-prefix
CONFIGURE_COMMAND echo "No configure" CONFIGURE_COMMAND echo "No configure"
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
BUILD_COMMAND ${PYTHON_EXECUTABLE} setup.py build BUILD_COMMAND ${BUILD_ENVIRONMENT} ${CMAKE_SOURCE_DIR}/external/python_build.cmake
INSTALL_COMMAND ${PYTHON_EXECUTABLE} setup.py install --prefix=${CMAKE_BINARY_DIR}/ext_build/python INSTALL_COMMAND ${BUILD_ENVIRONMENT} ${CMAKE_SOURCE_DIR}/external/python_install.cmake
) )
SET(PREV_PYTHON_BUILD ${PREV_PYTHON_BUILD} cython) SET(PREV_PYTHON_BUILD ${PREV_PYTHON_BUILD} cython)
ENDIF(INTERNAL_CYTHON) ENDIF(INTERNAL_CYTHON)

4
external/python_build.cmake vendored
View file

@ -4,8 +4,10 @@ SET(ENV{CPPFLAGS} ${PYTHON_CPPFLAGS})
SET(ENV{LDFLAGS} ${PYTHON_LDFLAGS}) SET(ENV{LDFLAGS} ${PYTHON_LDFLAGS})
SET(ENV{VOID_GSL} ${VOID_GSL}) SET(ENV{VOID_GSL} ${VOID_GSL})
SET(ENV{PYTHONPATH} ${PYTHON_LOCAL_SITE_PACKAGE}:$ENV{PYTHONPATH}) SET(ENV{PYTHONPATH} ${PYTHON_LOCAL_SITE_PACKAGE}:$ENV{PYTHONPATH})
SET(PYTHON_BUILD_COMMAND ${PYTHON_EXECUTABLE} setup.py build)
MESSAGE(STATUS "Running ${PYTHON_BUILD_COMMAND}")
execute_process( execute_process(
COMMAND ${PYTHON_EXECUTABLE} setup.py build COMMAND ${PYTHON_BUILD_COMMAND}
RESULT_VARIABLE RET_VALUE RESULT_VARIABLE RET_VALUE
) )

4
external/python_install.cmake vendored
View file

@ -4,8 +4,10 @@ SET(ENV{CPPFLAGS} ${PYTHON_CPPFLAGS})
SET(ENV{LDFLAGS} ${PYTHON_LDFLAGS}) SET(ENV{LDFLAGS} ${PYTHON_LDFLAGS})
SET(ENV{VOID_GSL} ${VOID_GSL}) SET(ENV{VOID_GSL} ${VOID_GSL})
SET(ENV{PYTHONPATH} ${PYTHON_LOCAL_SITE_PACKAGE}:$ENV{PYTHONPATH}) SET(ENV{PYTHONPATH} ${PYTHON_LOCAL_SITE_PACKAGE}:$ENV{PYTHONPATH})
SET(PYTHON_INSTALL_COMMAND ${PYTHON_EXECUTABLE} setup.py install --prefix=${TARGET_PATH} --install-lib=${PYTHON_LOCAL_SITE_PACKAGE})
message(STATUS "Running ${PYTHON_INSTALL_COMMAND}")
execute_process( execute_process(
COMMAND ${PYTHON_EXECUTABLE} setup.py install --prefix=${TARGET_PATH} COMMAND ${PYTHON_INSTALL_COMMAND}
RESULT_VARIABLE RET_VALUE RESULT_VARIABLE RET_VALUE
) )