From: asl <asl@opencascade.com>
Date: Wed, 6 Dec 2017 14:27:07 +0000 (+0300)
Subject: porting on Linux
X-Git-Tag: V8_5_0b1^2~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f21d850b9ff2dbff1f6eb588ec5b0006a4708dc9;p=modules%2Fgui.git

porting on Linux
---

diff --git a/adm_local/cmake_files/FindQwt.cmake b/adm_local/cmake_files/FindQwt.cmake
index 6ba61514f..fc2054f36 100644
--- a/adm_local/cmake_files/FindQwt.cmake
+++ b/adm_local/cmake_files/FindQwt.cmake
@@ -32,8 +32,8 @@ IF(NOT Qwt_FIND_QUIETLY)
     MESSAGE(STATUS "Looking for Qwt ...")
 ENDIF()
 
-FIND_PATH(QWT_INCLUDE_DIR qwt_plot.h PATH_SUFFIXES qwt HINTS ENV QWT_ROOT_DIR)
-FIND_PATH(QWT_INCLUDE_DIR qwt_plot.h PATH_SUFFIXES qwt-qt4 HINTS ENV QWT_ROOT_DIR)
+#FIND_PATH(QWT_INCLUDE_DIR qwt_plot.h PATH_SUFFIXES qwt HINTS ENV QWT_ROOT_DIR)
+#FIND_PATH(QWT_INCLUDE_DIR qwt_plot.h PATH_SUFFIXES qwt-qt4 HINTS ENV QWT_ROOT_DIR)
 FIND_PATH(QWT_INCLUDE_DIR qwt_plot.h PATH_SUFFIXES include HINTS ENV QWT_ROOT_DIR)
 
 
@@ -56,9 +56,9 @@ ELSE(WIN32)
   FIND_LIBRARY(QWT_LIBRARY qwt PATH_SUFFIXES lib lib64 PATHS "${QWT_ROOT_DIR}" NO_DEFAULT_PATH HINTS ENV QWT_ROOT_DIR)
   FIND_LIBRARY(QWT_LIBRARY qwt PATHS "${QWT_ROOT_DIR}" NO_DEFAULT_PATH HINTS ENV QWT_ROOT_DIR)
   FIND_LIBRARY(QWT_LIBRARY qwt-qt4 PATH_SUFFIXES lib lib64 HINTS ENV QWT_ROOT_DIR)
-  FIND_LIBRARY(QWT_LIBRARY qwt-qt4)
+  FIND_LIBRARY(QWT_LIBRARY qwt-qt4 HINTS ENV QWT_ROOT_DIR)
   FIND_LIBRARY(QWT_LIBRARY qwt PATH_SUFFIXES lib lib64 HINTS ENV QWT_ROOT_DIR)
-  FIND_LIBRARY(QWT_LIBRARY qwt)
+  FIND_LIBRARY(QWT_LIBRARY qwt HINTS ENV QWT_ROOT_DIR)
 ENDIF(WIN32)
 
 INCLUDE(FindPackageHandleStandardArgs)