Additional fix for previous commit

diff --git a/CMakeLists.txt b/CMakeLists.txt
index db5f050ef48b7ec6c581a2893c867bc3b3f9509e..843bdd16811188986218abba48bfa8abb76a062b 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -414,7 +414,12 @@ SET(QWT_ROOT_DIR "${QWT_ROOT_DIR}")
 SET(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/include" "${PROJECT_BINARY_DIR}/include")
 
 # Build variables that will be expanded when configuring Salome<MODULE>Config.cmake:
-SALOME_CONFIGURE_PREPARE(CAS OpenGL PyQt5 Qt5 Qwt SIP VTK)
+SALOME_CONFIGURE_PREPARE(CAS OpenGL Qwt SIP VTK)
+IF(NOT SALOME_BUILD_WITH_QT5)
+  SALOME_CONFIGURE_PREPARE(PyQt4 Qt4)
+ELSE()
+  SALOME_CONFIGURE_PREPARE(PyQt5 Qt5)
+ENDIF()
 
 CONFIGURE_PACKAGE_CONFIG_FILE(${PROJECT_NAME}Config.cmake.in 
     ${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake

diff --git a/tools/dlgfactory/CMakeLists.txt b/tools/dlgfactory/CMakeLists.txt
index be4da2b341e64cd1f0893aefb5782bf73f713349..83e6bd93db74ac1f959a6255f4f9256371ccf48b 100755 (executable)
--- a/tools/dlgfactory/CMakeLists.txt
+++ b/tools/dlgfactory/CMakeLists.txt
@@ -66,16 +66,25 @@ ADD_CUSTOM_COMMAND( OUTPUT GDialogTest.cxx  GDialogTest.h  GDialogTest.ui
   COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/dlgfactory.py -s -n GDialogTest -t gdialog
   )
 
-QT5_WRAP_UI(qtester_FORMS_HEADERS ${qtester_FORMS} )
-QT5_WRAP_CPP(qtester_HEADERS_MOC ${qtester_HEADERS})
+IF (NOT SALOME_BUILD_WITH_QT5)
+  QT4_WRAP_UI(qtester_FORMS_HEADERS ${qtester_FORMS} )
+  QT4_WRAP_CPP(qtester_HEADERS_MOC ${qtester_HEADERS})
 
+  QT4_WRAP_UI(gtester_FORMS_HEADERS ${gtester_FORMS} )
+  QT4_WRAP_CPP(gtester_HEADERS_MOC ${gtester_HEADERS})
 
-QT5_WRAP_UI(gtester_FORMS_HEADERS ${gtester_FORMS} )
-QT5_WRAP_CPP(gtester_HEADERS_MOC ${gtester_HEADERS})
+  QT4_WRAP_UI(GenericDialog_FORMS_HEADERS ${GenericDialog_FORMS} )
+  QT4_WRAP_CPP(GenericDialog_HEADERS_MOC ${GenericDialog_HEADERS})
+ELSE()
+  QT5_WRAP_UI(qtester_FORMS_HEADERS ${qtester_FORMS} )
+  QT5_WRAP_CPP(qtester_HEADERS_MOC ${qtester_HEADERS})
 
-QT5_WRAP_UI(GenericDialog_FORMS_HEADERS ${GenericDialog_FORMS} )
-QT5_WRAP_CPP(GenericDialog_HEADERS_MOC ${GenericDialog_HEADERS})
+  QT5_WRAP_UI(gtester_FORMS_HEADERS ${gtester_FORMS} )
+  QT5_WRAP_CPP(gtester_HEADERS_MOC ${gtester_HEADERS})
 
+  QT5_WRAP_UI(GenericDialog_FORMS_HEADERS ${GenericDialog_FORMS} )
+  QT5_WRAP_CPP(GenericDialog_HEADERS_MOC ${GenericDialog_HEADERS})
+ENDIF()
 ADD_EXECUTABLE(qtester ${qtester_SOURCES} 
     ${qtester_HEADERS_MOC} 
     ${qtester_FORMS_HEADERS}