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

This commit is contained in:
Guilhem Lavaux 2013-03-03 16:26:09 +01:00
commit 287400f032
53 changed files with 1692 additions and 104 deletions

View file

@ -321,7 +321,8 @@ SET(QHULL_LIBRARIES ${QHULL_CPP_LIBRARY} ${QHULL_LIBRARY} )
# Build libSDF
###############
IF(SDF_SUPPORT)
SET(LIBSDF_ARCH x86_64)
SET(LIBSDF_ARCH x86_64 CACHE STRING "SDF architecture to activate")
mark_as_advanced(LIBSDF_ARCH)
SET(LIBSDF_PATH ${CMAKE_SOURCE_DIR}/external/libsdf)
ExternalProject_Add(libSDF
@ -329,7 +330,7 @@ IF(SDF_SUPPORT)
SOURCE_DIR ${LIBSDF_PATH}
CONFIGURE_COMMAND echo No configure
BUILD_COMMAND ${CMAKE_MAKE_PROGRAM} ARCH=${LIBSDF_ARCH}
INSTALL_COMMAND echo No install
INSTALL_COMMAND ${CMAKE_COMMAND} -DDEST_DIR=${CMAKE_BINARY_DIR}/ext_build/sdf -DLIBSDF_ARCH=${LIBSDF_ARCH} -DLIBSDF_PATH=${LIBSDF_PATH} -P ${CMAKE_SOURCE_DIR}/external/install_sdf.cmake
BUILD_IN_SOURCE 1
)
SET(LIBSDF_INCLUDE_PATH ${LIBSDF_PATH}/include)