From: vsr <vsr@opencascade.com>
Date: Wed, 13 Jan 2016 14:07:23 +0000 (+0300)
Subject: Minor correction for correct Qt 5 detection in CONFIG mode
X-Git-Tag: V8_0_0a2^2~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=319dfea9acaf0dc7ddc80bfed212efd00a73bad0;hp=a1731e5f5af03fd7f94d90b0834c44ab0554c1d0;p=modules%2Fgui.git

Minor correction for correct Qt 5 detection in CONFIG mode
---

diff --git a/adm_local/cmake_files/FindSalomeQt5.cmake b/adm_local/cmake_files/FindSalomeQt5.cmake
index 647399710..31168f3ad 100644
--- a/adm_local/cmake_files/FindSalomeQt5.cmake
+++ b/adm_local/cmake_files/FindSalomeQt5.cmake
@@ -45,7 +45,7 @@ FOREACH(_Qt5_COMPONENT ${Qt5_FIND_COMPONENTS})
 ENDFOREACH()
 
 FIND_PACKAGE(Qt5LinguistTools)
-GET_TARGET_PROPERTY(QT_LRELEASE_EXECUTABLE ${Qt5_LRELEASE_EXECUTABLE} LOCATION)
+GET_TARGET_PROPERTY(QT_LRELEASE_EXECUTABLE Qt5::lrelease LOCATION)
 MARK_AS_ADVANCED(QT_LRELEASE_EXECUTABLE)
 
 GET_FILENAME_COMPONENT(QT_BINARY_DIR ${QT_LRELEASE_EXECUTABLE} DIRECTORY)
@@ -65,7 +65,8 @@ IF(Qt5Core_FOUND)
   SALOME_ACCUMULATE_ENVIRONMENT(PATH ${LINGUIST_PATH})
   SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${Qt5Core_LIBRARIES})
   SET(QT_VERSION "${Qt5Core_VERSION}")
-  SET(Qt5_DIR ${Qt5Core_DIR})
+  GET_FILENAME_COMPONENT(Qt5_DIR ${Qt5Core_DIR} PATH)
+  FILE(TO_NATIVE_PATH "${Qt5_DIR}/Qt5" Qt5_DIR)
   SET(SalomeQt5_COMPONENTS ${Qt5_FIND_COMPONENTS})
   MESSAGE(STATUS "Qt version is ${QT_VERSION}")
 ENDIF()