X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=adm_local%2Fcmake_files%2FFindSalomeQt4.cmake;h=a89fc81a80216f985bd78f093bdca1fac13c3507;hb=3a0ba13afff7a465ade65e11e7b84f22a658bea4;hp=ccca972b4bac8c06c6d32ccb2c0b291584931145;hpb=bf775cfc7109efa61e4c41678a4d880cd346f9f2;p=modules%2Fgui.git

diff --git a/adm_local/cmake_files/FindSalomeQt4.cmake b/adm_local/cmake_files/FindSalomeQt4.cmake
index ccca972b4..a89fc81a8 100644
--- a/adm_local/cmake_files/FindSalomeQt4.cmake
+++ b/adm_local/cmake_files/FindSalomeQt4.cmake
@@ -1,9 +1,9 @@
-# Copyright (C) 2013  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2013-2015  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -28,7 +28,6 @@ MARK_AS_ADVANCED(QT_QMAKE_EXECUTABLE)
 
 IF(QT4_FOUND) 
   SALOME_ACCUMULATE_HEADERS(QT_INCLUDES)
-  SALOME_ACCUMULATE_ENVIRONMENT(QT_PLUGIN_PATH ${QT4_ROOT_DIR}/plugins)
-  SALOME_ACCUMULATE_ENVIRONMENT(PATH ${QT4_ROOT_DIR}/bin)
-  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${QT4_ROOT_DIR}/lib)
+  SALOME_ACCUMULATE_ENVIRONMENT(PATH ${QT_QMAKE_EXECUTABLE})
+  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${QT_QTCORE_LIBRARY})
 ENDIF()