From eb63b0034f084de9618ee3033d17037b4b8e28ac Mon Sep 17 00:00:00 2001
From: gnieboer <gnieboer@corpcomm.net>
Date: Sun, 12 Mar 2017 15:07:44 -0400
Subject: [PATCH 1/2] Updated FindQwt to include add'l search paths

---
 cmake/Modules/FindQwt.cmake | 39 ++++++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/cmake/Modules/FindQwt.cmake b/cmake/Modules/FindQwt.cmake
index f2cf344..0933f32 100644
--- a/cmake/Modules/FindQwt.cmake
+++ b/cmake/Modules/FindQwt.cmake
@@ -4,23 +4,34 @@
 # QWT_FOUND If false, do not try to use Qwt
 
 find_path (QWT_INCLUDE_DIRS
-	NAMES qwt_plot.h
-	PATHS
-	/usr/local/include/qwt-qt4
-	/usr/local/include/qwt
-	/usr/include/qwt-qt4
-	/usr/include/qwt
-	/opt/local/include/qwt
-	/sw/include/qwt
+    NAMES qwt_plot.h
+    HINTS
+    ${CMAKE_INSTALL_PREFIX}/include/qwt
+    ${CMAKE_PREFIX_PATH}/include/qwt
+    PATHS
+    /usr/local/include/qwt-qt4
+    /usr/local/include/qwt
+    /usr/include/qwt6
+    /usr/include/qwt-qt4
+    /usr/include/qwt
+    /usr/include/qwt5
+    /opt/local/include/qwt
+    /sw/include/qwt
+    /usr/local/lib/qwt.framework/Headers
 )
 
 find_library (QWT_LIBRARIES
-	NAMES qwt-qt4 qwt
-	PATHS
-	/usr/local/lib
-	/usr/lib
-	/opt/local/lib
-	/sw/lib
+    NAMES qwt6 qwt6-qt4 qwt qwt-qt4 qwt5 qwtd5
+    HINTS
+    ${CMAKE_INSTALL_PREFIX}/lib
+    ${CMAKE_INSTALL_PREFIX}/lib64
+    ${CMAKE_PREFIX_PATH}/lib 
+    PATHS
+    /usr/local/lib
+    /usr/lib
+    /opt/local/lib
+    /sw/lib
+    /usr/local/lib/qwt.framework
 )
 
 # handle the QUIETLY and REQUIRED arguments and set QWT_FOUND to TRUE if

From 3b65986159c078921ed697334080591d79f2327c Mon Sep 17 00:00:00 2001
From: gnieboer <gnieboer@corpcomm.net>
Date: Sun, 12 Mar 2017 15:08:18 -0400
Subject: [PATCH 2/2] Updated GrBoost.cmake to include quoted string fix from
 GR

---
 cmake/Modules/GrBoost.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmake/Modules/GrBoost.cmake b/cmake/Modules/GrBoost.cmake
index d2e91a6..fcac5cf 100644
--- a/cmake/Modules/GrBoost.cmake
+++ b/cmake/Modules/GrBoost.cmake
@@ -87,7 +87,7 @@ set(Boost_NOGO_VERSIONS
   )
 
 foreach(ver ${Boost_NOGO_VERSIONS})
-  if(${Boost_VERSION} EQUAL ${ver})
+  if("${Boost_VERSION}" STREQUAL "${ver}")
     if(NOT ENABLE_BAD_BOOST)
       MESSAGE(STATUS "WARNING: Found a known bad version of Boost (v${Boost_VERSION}). Disabling.")
       set(Boost_FOUND FALSE)
@@ -95,5 +95,5 @@ foreach(ver ${Boost_NOGO_VERSIONS})
       MESSAGE(STATUS "WARNING: Found a known bad version of Boost (v${Boost_VERSION}). Continuing anyway.")
       set(Boost_FOUND TRUE)
     endif(NOT ENABLE_BAD_BOOST)
-  endif(${Boost_VERSION} EQUAL ${ver})
+  endif("${Boost_VERSION}" STREQUAL "${ver}")
 endforeach(ver)