Salome HOME
Minor correction for correct Qt 5 detection in CONFIG mode
authorvsr <vsr@opencascade.com>
Wed, 13 Jan 2016 14:07:23 +0000 (17:07 +0300)
committervsr <vsr@opencascade.com>
Wed, 13 Jan 2016 14:07:23 +0000 (17:07 +0300)
adm_local/cmake_files/FindSalomeQt5.cmake

index 64739971096553d7070e2fd66eaf931263ae8827..31168f3ad49edf68229ba33e235d7647d7c16c63 100644 (file)
@@ -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()