Compatibility with CMake 2.8.12

diff --git a/src/MEDOP/gui/dialogs/CMakeLists.txt b/src/MEDOP/gui/dialogs/CMakeLists.txt
index 43523210f5480a67b5e8a8e88a0af39bd1b825dc..7b550727b950b1354a08eac5be28640d7514c647 100644 (file)
--- a/src/MEDOP/gui/dialogs/CMakeLists.txt
+++ b/src/MEDOP/gui/dialogs/CMakeLists.txt
@@ -21,20 +21,6 @@ ADD_DEFINITIONS(${CAS_DEFINITIONS} ${BOOST_DEFINITIONS} ${OMNIORB_DEFINITIONS})
 
 INCLUDE(UseQt4Ext)
 
-MACRO (QT4_WRAP_UI_XX outfiles )
-  QT4_EXTRACT_OPTIONS(ui_files ui_options ${ARGN})
-  FOREACH (it ${ui_files})
-    GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
-    GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
-    SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.hxx)
-    ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
-      COMMAND ${QT_UIC_EXECUTABLE}
-      ARGS ${ui_options} -o ${outfile} ${infile}
-      MAIN_DEPENDENCY ${infile})
-    SET(${outfiles} ${${outfiles}} ${outfile})
-  ENDFOREACH (it)
-ENDMACRO (QT4_WRAP_UI_XX)
-
 SET(MEDOPGUI_dialogs_FORMS
   GenericDialog.ui
   DlgAlias.ui
@@ -42,7 +28,7 @@ SET(MEDOPGUI_dialogs_FORMS
   DlgChangeUnderlyingMesh.ui
   DlgImageToMed.ui
 )
-QT4_WRAP_UI_XX(MEDOPGUI_dialogs_FORMS_HEADERS ${MEDOPGUI_dialogs_FORMS})
+QT4_WRAP_UI(MEDOPGUI_dialogs_FORMS_HEADERS ${MEDOPGUI_dialogs_FORMS})
 
 SET(MEDOPGUI_dialogs_FILES
   GenericDialog.hxx

diff --git a/src/MEDOP/gui/dialogs/DlgAlias.hxx b/src/MEDOP/gui/dialogs/DlgAlias.hxx
index 81a3df028ad6ca9a636b0085950ad4b4eb0272bf..c96a27f56eced8e7ff8727e1ef7ed7ab32211fb5 100644 (file)
--- a/src/MEDOP/gui/dialogs/DlgAlias.hxx
+++ b/src/MEDOP/gui/dialogs/DlgAlias.hxx
@@ -2,7 +2,7 @@
 #define DLGALIAS_H
 
 #include <QtGui>
-#include "ui_DlgAlias.hxx"
+#include "ui_DlgAlias.h"
 #include "MEDOPGUIdialogs.hxx"
 
 class MEDOPGUI_DIALOGS_EXPORT DlgAlias : public QDialog

diff --git a/src/MEDOP/gui/dialogs/DlgChangeUnderlyingMesh.hxx b/src/MEDOP/gui/dialogs/DlgChangeUnderlyingMesh.hxx
index ab4bffb4e2bedeba7c026ec8cc8cae7face33d02..914e10be0119485fd59cd6d241dcdf25c66130b5 100644 (file)
--- a/src/MEDOP/gui/dialogs/DlgChangeUnderlyingMesh.hxx
+++ b/src/MEDOP/gui/dialogs/DlgChangeUnderlyingMesh.hxx
@@ -2,7 +2,7 @@
 #define _DlgChangeUnderlyingMesh_HXX
 
 #include <QtGui>
-#include "ui_DlgChangeUnderlyingMesh.hxx"
+#include "ui_DlgChangeUnderlyingMesh.h"
 #include "GenericDialog.hxx"
 
 #include <SALOME_AppStudyEditor.hxx>

diff --git a/src/MEDOP/gui/dialogs/DlgImageToMed.hxx b/src/MEDOP/gui/dialogs/DlgImageToMed.hxx
index 7b396f03868a5bbb437ae063212105102e226001..1f5561db01953db702c0329134b55876bd9a5f61 100644 (file)
--- a/src/MEDOP/gui/dialogs/DlgImageToMed.hxx
+++ b/src/MEDOP/gui/dialogs/DlgImageToMed.hxx
@@ -2,7 +2,7 @@
 #define _DlgImageToMed_HXX
 
 #include <QtGui>
-#include "ui_DlgImageToMed.hxx"
+#include "ui_DlgImageToMed.h"
 #include "GenericDialog.hxx"
 
 #include "MEDOPGUIdialogs.hxx"

diff --git a/src/MEDOP/gui/dialogs/DlgUseInWorkspace.hxx b/src/MEDOP/gui/dialogs/DlgUseInWorkspace.hxx
index 0bf316064ec19f66e2840d495e226e4bbc5424fd..6fb2489397b27cebc342ed1bc9aaf5944d04d3e5 100644 (file)
--- a/src/MEDOP/gui/dialogs/DlgUseInWorkspace.hxx
+++ b/src/MEDOP/gui/dialogs/DlgUseInWorkspace.hxx
@@ -2,7 +2,7 @@
 #define _DlgUseInWorkspace_HXX
 
 #include <QtGui>
-#include "ui_DlgUseInWorkspace.hxx"
+#include "ui_DlgUseInWorkspace.h"
 #include "GenericDialog.hxx"
 
 class DlgUseInWorkspace : public GenericDialog

diff --git a/src/MEDOP/gui/dialogs/GenericDialog.hxx b/src/MEDOP/gui/dialogs/GenericDialog.hxx
index ee946617d4393ba94f4dfbf7ff47f0116a205f4b..1c9d7ea69066a51b5a71116d70cc32c8567ba231 100644 (file)
--- a/src/MEDOP/gui/dialogs/GenericDialog.hxx
+++ b/src/MEDOP/gui/dialogs/GenericDialog.hxx
@@ -2,7 +2,7 @@
 #define _GenericDialog_HXX
 
 #include <QtGui>
-#include "ui_GenericDialog.hxx"
+#include "ui_GenericDialog.h"
 
 class GenericDialog : public QDialog
 {