From 87aa063a89d1fb8ea5f6f7f54b600b7f77daa285 Mon Sep 17 00:00:00 2001 From: imn Date: Fri, 20 Nov 2015 16:03:42 +0300 Subject: [PATCH] Correctly set environment --- adm_local/cmake_files/FindSalomeQt5.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/adm_local/cmake_files/FindSalomeQt5.cmake b/adm_local/cmake_files/FindSalomeQt5.cmake index 88cbb3c51..66f491fe9 100644 --- a/adm_local/cmake_files/FindSalomeQt5.cmake +++ b/adm_local/cmake_files/FindSalomeQt5.cmake @@ -63,12 +63,12 @@ SET(QT_INCLUDES ${Qt5Core_INCLUDES} ${Qt5Gui_INCLUDES} ${Qt5Widgets_INCLUDES} ${ SET(QT_DEFINITIONS ${Qt5Core_DEFINITIONS} ${Qt5Gui_DEFINITIONS} ${Qt5Widgets_DEFINITIONS} ${Qt5Network_DEFINITIONS} ${Qt5Xml_DEFINITIONS} ${Qt5OpenGL_DEFINITIONS} ${Qt5PrintSupport_DEFINITIONS} ${Qt5WebKit_DEFINITIONS} ${Qt5WebKitWidgets_DEFINITIONS} ${Qt5X11Extras_DEFINITIONS}) SET(QT_LIBRARIES ${Qt5Core_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${Qt5Network_LIBRARIES} ${Qt5Xml_LIBRARIES} ${Qt5OpenGL_LIBRARIES} ${Qt5PrintSupport_LIBRARIES} ${Qt5WebKit_LIBRARIES} ${Qt5WebKitWidgets_LIBRARIES} ${Qt5X11Extras_LIBRARIES}) -#MARK_AS_ADVANCED(QT_QMAKE_EXECUTABLE) -# +MARK_AS_ADVANCED(LINGUIST_PATH) + IF(Qt5Core_FOUND) -# SALOME_ACCUMULATE_HEADERS(QT_INCLUDES) -# SALOME_ACCUMULATE_ENVIRONMENT(PATH ${QT_QMAKE_EXECUTABLE}) -# SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${QT_QTCORE_LIBRARY}) + SALOME_ACCUMULATE_HEADERS(QT_INCLUDES) + SALOME_ACCUMULATE_ENVIRONMENT(PATH ${LINGUIST_PATH}) + SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${Qt5Core_LIBRARIES}) SET(QT_VERSION "${Qt5Core_VERSION}") MESSAGE(STATUS "Qt version is ${QT_VERSION}") ENDIF() -- 2.39.2