Merge pull request #100 from gnieboer/WinFixes

Win fixes

cmake/Modules/FindQwt.cmake

@@ -5,22 +5,33 @@
 
 find_path (QWT_INCLUDE_DIRS
     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
+    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

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)