From 8736ac20a1a7def9a024aa9c934b7b95ffdef373 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Tue, 17 Jan 2012 15:42:25 -0800
Subject: cmake: fix for cmake 2.6 with library extras mode

OUTPUT_NAME is a target output name that should work with both 2.6 and 2.8

LIBRARY_OUTPUT_NAME is new to 2.8 and more specific
---
 cmake/Modules/GrMiscUtils.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cmake')

diff --git a/cmake/Modules/GrMiscUtils.cmake b/cmake/Modules/GrMiscUtils.cmake
index 0e1f40027..27003cf59 100644
--- a/cmake/Modules/GrMiscUtils.cmake
+++ b/cmake/Modules/GrMiscUtils.cmake
@@ -155,7 +155,7 @@ function(GR_LIBRARY_FOO target)
         GR_LIBTOOL(TARGET ${target} DESTINATION ${GR_LIBRARY_DIR})
 
         #give the library a special name with ultra-zero soversion
-        set_target_properties(${target} PROPERTIES LIBRARY_OUTPUT_NAME ${target}-${LIBVER} SOVERSION "0.0.0")
+        set_target_properties(${target} PROPERTIES OUTPUT_NAME ${target}-${LIBVER} SOVERSION "0.0.0")
         set(target_name lib${target}-${LIBVER}.so.0.0.0)
 
         #custom command to generate symlinks
-- 
cgit 


From 9f41efcb0a98f035186d84deffa21f1c38141845 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Tue, 17 Jan 2012 15:51:05 -0800
Subject: qtgui: better findqwt.cmake with standard paths

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

(limited to 'cmake')

diff --git a/cmake/Modules/FindQwt.cmake b/cmake/Modules/FindQwt.cmake
index bc8683f7d..857020796 100644
--- a/cmake/Modules/FindQwt.cmake
+++ b/cmake/Modules/FindQwt.cmake
@@ -3,11 +3,22 @@
 # QWT_LIBRARIES libraries to link against
 # QWT_FOUND If false, do not try to use Qwt
 
-find_path ( QWT_INCLUDE_DIRS qwt_plot.h /usr/include/qwt-qt4 /usr/include/qwt /opt/local/include/qwt )
-	  
-find_library ( QWT_LIBRARIES NAMES qwt-qt4 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
+)
+
+find_library (QWT_LIBRARIES
+	NAMES qwt-qt4 qwt
+	PATHS /usr/local/lib /usr/lib
+)
 
 # handle the QUIETLY and REQUIRED arguments and set QWT_FOUND to TRUE if 
 # all listed variables are TRUE
 include ( FindPackageHandleStandardArgs )
 find_package_handle_standard_args( Qwt DEFAULT_MSG QWT_LIBRARIES QWT_INCLUDE_DIRS )
+MARK_AS_ADVANCED(QWT_LIBRARIES QWT_INCLUDE_DIRS)
-- 
cgit