From 3c976b8f8d8e93749f3144464795d4abb4b31e06 Mon Sep 17 00:00:00 2001
From: Guilhem Lavaux <lavaux@iap.fr>
Date: Mon, 19 Mar 2018 23:17:38 +0100
Subject: [PATCH] Build fixes for Beeston

---
 external/external_build.cmake | 1 +
 sample/CMakeLists.txt         | 2 +-
 src/CMakeLists.txt            | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/external/external_build.cmake b/external/external_build.cmake
index bfadc56..0b07227 100644
--- a/external/external_build.cmake
+++ b/external/external_build.cmake
@@ -267,6 +267,7 @@ IF(INTERNAL_GSL)
   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(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)
 ELSE(INTERNAL_GSL)
   find_path(GSL_INCLUDE_PATH NAMES gsl/gsl_blas.h)
diff --git a/sample/CMakeLists.txt b/sample/CMakeLists.txt
index ee87487..900b59f 100644
--- a/sample/CMakeLists.txt
+++ b/sample/CMakeLists.txt
@@ -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(${FFTW3_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS} ${GSL_INCLUDE_PATH})
 if(YORICK_SUPPORT)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ee65f47..b9c1dc2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -78,7 +78,7 @@ if(YORICK_SUPPORT)
 endif(YORICK_SUPPORT)
 
 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}")
 endif (HDF5_FOUND)