From: adam <adam>
Date: Tue, 21 Feb 2012 12:58:27 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: V6_5_0a1~40
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=6e3238798e46d4fd1569884c45d72b02d4c27fa9;p=modules%2Fgui.git

*** empty log message ***
---

diff --git a/adm_local/cmake_files/FindQWT.cmake b/adm_local/cmake_files/FindQWT.cmake
index f80fc96f6..4c008cc5a 100644
--- a/adm_local/cmake_files/FindQWT.cmake
+++ b/adm_local/cmake_files/FindQWT.cmake
@@ -18,11 +18,16 @@
 #
 
 SET(QWTHOME $ENV{QWTHOME})
-FIND_PATH(QWT_INCLUDE_DIR qwt_plot.h ${QWTHOME}/include)
+IF(NOT QWTHOME)
+  SET(QWTHOME /usr)
+ENDIF(NOT QWTHOME)
+
+FIND_PATH(QWT_INCLUDE_DIR qwt_plot.h PATHS ${QWTHOME}/include ${QWTHOME}/include/qwt)
 SET(QWT_INCLUDES -I${QWT_INCLUDE_DIR})
 IF(WINDOWS)
 SET(QWT_INCLUDES ${QWT_INCLUDES} -DQWT_DLL)
 ENDIF(WINDOWS)
+
 IF(WINDOWS)
 IF(CMAKE_BUILD_TYPE STREQUAL Debug)
 FIND_LIBRARY(QWT_LIBS qwtd5 ${QWTHOME}/lib)
@@ -30,5 +35,5 @@ ELSE(CMAKE_BUILD_TYPE STREQUAL Debug)
 FIND_LIBRARY(QWT_LIBS qwt5 ${QWTHOME}/lib)
 ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug)
 ELSE(WINDOWS)
-FIND_LIBRARY(QWT_LIBS qwt ${QWTHOME}/lib)
+FIND_LIBRARY(QWT_LIBS qwt PATHS ${QWTHOME}/lib ${QWTHOME}/lib64)
 ENDIF(WINDOWS)