From 319dfea9acaf0dc7ddc80bfed212efd00a73bad0 Mon Sep 17 00:00:00 2001 From: vsr Date: Wed, 13 Jan 2016 17:07:23 +0300 Subject: [PATCH] Minor correction for correct Qt 5 detection in CONFIG mode --- adm_local/cmake_files/FindSalomeQt5.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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() -- 2.39.2