]> SALOME platform Git repositories - modules/gui.git/commitdiff
Salome HOME
Correction check QT_VERSION in macros
authorimn <imn@opencascade.com>
Fri, 20 Nov 2015 18:28:23 +0000 (21:28 +0300)
committerimn <imn@opencascade.com>
Fri, 20 Nov 2015 18:28:23 +0000 (21:28 +0300)
adm_local/cmake_files/UseQtExt.cmake

index 9c3f5103c1f0919cc636b1e2f7fb2a36ca3001fd..626e66aa806b5606ae9aa5d63d3012d27f1e84c7 100644 (file)
@@ -40,7 +40,7 @@ MACRO(QT_INSTALL_TS_RESOURCES MYTSFILES WHERETOINSTALL)
 ENDMACRO(QT_INSTALL_TS_RESOURCES)
 
 MACRO(QT_WRAP_MOC)
-IF (NOT SALOME_BUILD_WITH_QT5)
+IF (QT_VERSION VERSION_LESS "5.0")
   QT4_WRAP_CPP(${ARGN})
 ELSE()
   QT5_WRAP_CPP(${ARGN})
@@ -48,7 +48,7 @@ ENDIF()
 ENDMACRO(QT_WRAP_MOC)
 
 MACRO(QT_WRAP_UIC)
-IF (NOT SALOME_BUILD_WITH_QT5)
+IF (QT_VERSION VERSION_LESS "5.0")
   QT4_WRAP_UI(${ARGN})
 ELSE()
   QT5_WRAP_UI(${ARGN})
@@ -56,7 +56,7 @@ ENDIF()
 ENDMACRO(QT_WRAP_UIC)
 
 MACRO(QT_ADD_RESOURCES)
-IF (NOT SALOME_BUILD_WITH_QT5)
+IF (QT_VERSION VERSION_LESS "5.0")
   QT4_ADD_RESOURCES(${ARGN})
 ELSE()
   QT5_ADD_RESOURCES(${ARGN})