From 0fd3b832b1f18a272f01210c19c8fc92ec91286c Mon Sep 17 00:00:00 2001
From: Thomas White <taw@physics.org>
Date: Wed, 30 May 2018 14:54:16 +0200
Subject: libcrystfel should link against GSL and pthreads

Then programs using libcrystfel don't need -lgsl (unless they use it
themselves, of course)
---
 libcrystfel/CMakeLists.txt | 2 +-
 libcrystfel/crystfel.pc.in | 2 +-
 src/scaling.c              | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/libcrystfel/CMakeLists.txt b/libcrystfel/CMakeLists.txt
index 271291e4..1fba6624 100644
--- a/libcrystfel/CMakeLists.txt
+++ b/libcrystfel/CMakeLists.txt
@@ -111,7 +111,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 add_definitions(-DHAVE_CONFIG_H)
 
 target_include_directories(${PROJECT_NAME} PRIVATE ${HDF5_INCLUDE_DIRS})
-target_link_libraries(${PROJECT_NAME} PRIVATE util ${HDF5_C_LIBRARIES})
+target_link_libraries(${PROJECT_NAME} PRIVATE util ${HDF5_C_LIBRARIES} Threads::Threads GSL::gsl m)
 
 if (XGANDALF_FOUND)
   target_include_directories(${PROJECT_NAME} PRIVATE ${XGANDALF_INCLUDES})
diff --git a/libcrystfel/crystfel.pc.in b/libcrystfel/crystfel.pc.in
index 7539cad1..41320acd 100644
--- a/libcrystfel/crystfel.pc.in
+++ b/libcrystfel/crystfel.pc.in
@@ -8,4 +8,4 @@ Description: Useful routines for crystallography using a free-electron laser
 Version: ${PROJECT_VERSION}+${GIT_SHA1}
 Cflags: -I${CMAKE_INSTALL_FULL_INCLUDEDIR} -pthread
 Libs: -L${CMAKE_INSTALL_FULL_LIBDIR} -lcrystfel
-Requires: gsl
+Requires.private: gsl
diff --git a/src/scaling.c b/src/scaling.c
index cabc5952..21bd0db2 100644
--- a/src/scaling.c
+++ b/src/scaling.c
@@ -37,7 +37,6 @@
 #include <gsl/gsl_vector.h>
 #include <gsl/gsl_linalg.h>
 #include <gsl/gsl_eigen.h>
-#include <gsl/gsl_blas.h>
 #include <gsl/gsl_fit.h>
 #include <gsl/gsl_statistics_double.h>
 
-- 
cgit v1.2.3