[Commit-gnuradio] [gnuradio] 03/06: cmake: set correct vars when pkg-config finds GSL

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch maint
in repository gnuradio.

commit e5b0eb691de1ac4b968f5e2c0305d7138e65ec70
Author: Nathan West <address@hidden>
Date:   Thu Jul 23 17:42:08 2015 -0400

    cmake: set correct vars when pkg-config finds GSL
---
 cmake/Modules/FindGSL.cmake | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/cmake/Modules/FindGSL.cmake b/cmake/Modules/FindGSL.cmake
index 6d71552..b36a1e9 100644
--- a/cmake/Modules/FindGSL.cmake
+++ b/cmake/Modules/FindGSL.cmake
@@ -18,8 +18,10 @@
 
 INCLUDE(FindPkgConfig)
 PKG_CHECK_MODULES(GSL "gsl >= 1.10")
-IF(NOT GSL_FOUND)
-
+IF(GSL_FOUND)
+    set(GSL_LIBRARY_DIRS ${GSL_LIBDIR})
+    set(GSL_INCLUDE_DIRS ${GSL_INCLUDEDIR})
+ELSE(GSL_FOUND)
 set( GSL_FOUND OFF )
 set( GSL_CBLAS_FOUND OFF )
 
@@ -141,6 +143,7 @@ endif( GSL_FOUND )
 #needed for gsl windows port but safe to always define
 LIST(APPEND GSL_DEFINITIONS "-DGSL_DLL")
 
+ENDIF(GSL_FOUND)
+
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(GSL DEFAULT_MSG GSL_LIBRARIES 
GSL_INCLUDE_DIRS)
-ENDIF(NOT GSL_FOUND)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GSL DEFAULT_MSG GSL_LIBRARIES 
GSL_INCLUDE_DIRS GSL_LIBRARY_DIRS)