diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2015-07-24 08:18:40 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2015-07-24 08:18:40 -0700 |
| commit | 474f88abe17c873c78cedcda28b4d321eafeebbd (patch) | |
| tree | 525d9bdb8450938f931878ff710a218fcd04945d /cmake | |
| parent | cc973de4273bd74d10504fba880804b22e462145 (diff) | |
| parent | f8a9f9fb9939799228ef38deab68c71a44acd324 (diff) | |
Merge branch 'maint'
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/FindGSL.cmake | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/cmake/Modules/FindGSL.cmake b/cmake/Modules/FindGSL.cmake index 6d7155284f..b36a1e9c2a 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) |