Build fixes for Beeston
This commit is contained in:
parent
4f250969ac
commit
3c976b8f8d
1
external/external_build.cmake
vendored
1
external/external_build.cmake
vendored
@ -267,6 +267,7 @@ IF(INTERNAL_GSL)
|
|||||||
SET(GSL_LIBRARY ${GSL_INTERNAL_LIBS}/libgsl.a CACHE STRING "GSL internal path" FORCE)
|
SET(GSL_LIBRARY ${GSL_INTERNAL_LIBS}/libgsl.a CACHE STRING "GSL internal path" FORCE)
|
||||||
SET(GSLCBLAS_LIBRARY ${GSL_INTERNAL_LIBS}/libgslcblas.a CACHE STRING "GSL internal path" FORCE)
|
SET(GSLCBLAS_LIBRARY ${GSL_INTERNAL_LIBS}/libgslcblas.a CACHE STRING "GSL internal path" FORCE)
|
||||||
set(GSL_INCLUDE_PATH ${CMAKE_BINARY_DIR}/ext_build/gsl/include CACHE STRING "GSL internal path" FORCE)
|
set(GSL_INCLUDE_PATH ${CMAKE_BINARY_DIR}/ext_build/gsl/include CACHE STRING "GSL internal path" FORCE)
|
||||||
|
set(GSL_LIBRARIES ${GSL_LIBRARY} ${GSLCBLAS_LIBRARY})
|
||||||
SET(cosmotool_DEPS ${cosmotool_DEPS} gsl)
|
SET(cosmotool_DEPS ${cosmotool_DEPS} gsl)
|
||||||
ELSE(INTERNAL_GSL)
|
ELSE(INTERNAL_GSL)
|
||||||
find_path(GSL_INCLUDE_PATH NAMES gsl/gsl_blas.h)
|
find_path(GSL_INCLUDE_PATH NAMES gsl/gsl_blas.h)
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
SET(tolink ${GSL_LIBRARIES} ${CosmoTool_local} ${CosmoTool_LIBS} ${DL_LIBRARY})
|
SET(tolink ${CosmoTool_local} ${CosmoTool_LIBS} ${GSL_LIBRARIES} ${DL_LIBRARY})
|
||||||
include_directories(${CMAKE_SOURCE_DIR}/src)
|
include_directories(${CMAKE_SOURCE_DIR}/src)
|
||||||
include_directories(${FFTW3_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS} ${GSL_INCLUDE_PATH})
|
include_directories(${FFTW3_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS} ${GSL_INCLUDE_PATH})
|
||||||
if(YORICK_SUPPORT)
|
if(YORICK_SUPPORT)
|
||||||
|
@ -78,7 +78,7 @@ if(YORICK_SUPPORT)
|
|||||||
endif(YORICK_SUPPORT)
|
endif(YORICK_SUPPORT)
|
||||||
|
|
||||||
if (HDF5_FOUND)
|
if (HDF5_FOUND)
|
||||||
set(CosmoTool_LIBS ${CosmoTool_LIBS} ${HDF5_LIBRARIES} ${HDF5_HL_LIBRARIES} ${HDF5_CXX_LIBRARIES} ${ZLIB})
|
set(CosmoTool_LIBS ${CosmoTool_LIBS} ${HDF5_CXX_LIBRARIES} ${HDF5_HL_LIBRARIES} ${HDF5_LIBRARIES} ${ZLIB})
|
||||||
message(STATUS "CosmoTool_LIBS: ${CosmoTool_LIBS}")
|
message(STATUS "CosmoTool_LIBS: ${CosmoTool_LIBS}")
|
||||||
endif (HDF5_FOUND)
|
endif (HDF5_FOUND)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user