diff options
author | Johnathan Corgan <johnathan@corganlabs.com> | 2012-11-26 06:40:51 -0800 |
---|---|---|
committer | Johnathan Corgan <johnathan@corganlabs.com> | 2012-11-26 06:40:51 -0800 |
commit | 2e1b7a5dc7af96054234af1e7a5c5f2abf21893b (patch) | |
tree | 466544a622a58a9cf2d23d9c690e0ef61b4831cb /cmake | |
parent | 4d957e4fb0fbe12e20c6890035f4b66b1a63115b (diff) | |
parent | 9ea88b7b2af1cda2dae9ef5ab733bc1644cd42a3 (diff) |
Merge branch 'master' into next
Diffstat (limited to 'cmake')
-rw-r--r-- | cmake/Modules/FindQwt.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cmake/Modules/FindQwt.cmake b/cmake/Modules/FindQwt.cmake index f2cf3440dd..db5ca6d27e 100644 --- a/cmake/Modules/FindQwt.cmake +++ b/cmake/Modules/FindQwt.cmake @@ -11,6 +11,7 @@ find_path (QWT_INCLUDE_DIRS /usr/include/qwt-qt4 /usr/include/qwt /opt/local/include/qwt + /opt/local/lib/qwt.framework/Headers /sw/include/qwt ) @@ -20,6 +21,7 @@ find_library (QWT_LIBRARIES /usr/local/lib /usr/lib /opt/local/lib + /opt/local/lib/qwt.framework /sw/lib ) |