From 76838b9c5b095e4258a118802ca91bbe45803684 Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 7 Dec 2015 17:02:43 +0300 Subject: [PATCH] Move INCLUDE(${QT_USE_FILE}) to UseQtExt.cmake --- CMakeLists.txt | 1 - adm_local/cmake_files/UseQtExt.cmake | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 546284a25..eb6ab60a8 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -151,7 +151,6 @@ ENDIF() # Qt IF(NOT SALOME_BUILD_WITH_QT5) FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui QtXml QtWebKit QtOpenGL QtNetwork) - INCLUDE(${QT_USE_FILE}) ADD_DEFINITIONS("-DUSE_SALOME_STYLE") ELSE() FIND_PACKAGE(SalomeQt5 REQUIRED) diff --git a/adm_local/cmake_files/UseQtExt.cmake b/adm_local/cmake_files/UseQtExt.cmake index 626e66aa8..03e40f2ac 100644 --- a/adm_local/cmake_files/UseQtExt.cmake +++ b/adm_local/cmake_files/UseQtExt.cmake @@ -17,6 +17,10 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # +IF (QT_VERSION VERSION_LESS "5.0") + INCLUDE(${QT_USE_FILE}) +ENDIF() + INSTALL(CODE "MACRO(QT_COMPILE_TS_ON_INSTALL MYLRELEASE MYTSFILE MYFULLDIR MYOUTQMFILE) FILE(MAKE_DIRECTORY \${MYFULLDIR}) MESSAGE(STATUS \"Compiling \${MYTSFILE}\") -- 2.39.2