diff options
| author | Joshua L. Blocher <verbalshadow@gmail.com> | 2008-06-24 06:40:46 +0000 |
|---|---|---|
| committer | verbalshadow <verbalshadow@users.sourceforge.net> | 2008-06-24 06:40:46 +0000 |
| commit | 11a4c8db9c6e06c9f0d39b5a7a63800a8a3337f0 (patch) | |
| tree | 0d5aaae17e1623121da4c04c9fe3e993c8c2a12c | |
| parent | Cmake: remove header files from source lists (diff) | |
| download | inkscape-11a4c8db9c6e06c9f0d39b5a7a63800a8a3337f0.tar.gz inkscape-11a4c8db9c6e06c9f0d39b5a7a63800a8a3337f0.zip | |
Cmake: Add GSL to LIBS and Includes
(bzr r6047)
| -rw-r--r-- | CMakeScripts/DefineDependsandFlags.cmake | 2 | ||||
| -rw-r--r-- | CMakeScripts/FindGSL.cmake | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index e15c4a014..8d23ce08f 100644 --- 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 0297f7375..1ef4643ad 100644 --- 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 ) |