Cmake: Add GSL to LIBS and Includes

diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
index e15c4a014aeccfcbc755d039cf5e03dfba961516..8d23ce08ffc7951c07832d3c2cabb4a8b4dde2e3 100644 (file)
--- a/CMakeScripts/DefineDependsandFlags.cmake
+++ b/CMakeScripts/DefineDependsandFlags.cmake
@@ -23,6 +23,7 @@ LIST(APPEND INKSCAPE_LIBS
 ${GTK2_LIBRARIES}
 ${GTKMM_LIBRARIES}
 ${SIGC++_LIBRARIES}
+${GSL_LIBRARIES}
 ${XML2_LIBRARIES}
 ${XSLT_LIBRARIES}
 ${IMAGEMAGICK++_LIBRARIES}
@@ -43,6 +44,7 @@ ${PROJECT_SOURCE_DIR}/src
 ${GTK2_INCLUDE_DIRS}
 ${GTKMM_INCLUDE_DIRS}
 ${SIGC++_INCLUDE_DIRS}
+${GSL_INCLUDE_DIRS}
 ${XML2_INCLUDE_DIRS}
 ${XSLT_INCLUDE_DIRS}
 ${IMAGEMAGICK++_INCLUDE_DIRS}

diff --git a/CMakeScripts/FindGSL.cmake b/CMakeScripts/FindGSL.cmake
index 0297f7375f2a75b03492c318c380096abe437e8f..1ef4643ad7d4e264868af9d2e47ead35930a7af2 100644 (file)
--- a/CMakeScripts/FindGSL.cmake
+++ b/CMakeScripts/FindGSL.cmake
@@ -6,7 +6,7 @@
 #  GSL_LIBRARIES - Link these to use GSL
 #  GSL_DEFINITIONS - Compiler switches required for using GSL
 #
-#  Copyright (c) 2008  Joshua L. Blocher <verbalshadow@gmail.com>
+#  Copyright (c) 2008 Joshua L. Blocher <verbalshadow@gmail.com>
 #
 #  Redistribution and use is allowed according to the terms of the New
 #  BSD license.
@@ -31,14 +31,13 @@ else (GSL_LIBRARIES AND GSL_INCLUDE_DIRS)
   endif (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
   find_path(GSL_INCLUDE_DIR
     NAMES
-      gsl_matrix.h
+      gsl_blas.h
     PATHS
       ${_GSL_INCLUDEDIR}
       /usr/include
       /usr/local/include
       /opt/local/include
       /sw/include
-      $ENV{DEVLIBS_PATH}//include//
     PATH_SUFFIXES
       gsl
   )