From: vsr <vsr@opencascade.com>
Date: Wed, 20 Jan 2016 12:00:13 +0000 (+0300)
Subject: Merge branch 'V7_dev' into V8_0_0_BR
X-Git-Tag: V8_0_0b1^0
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f2cde5cce2779acb64c69743f46c5a72b5ce281f;p=modules%2Fhomard.git

Merge branch 'V7_dev' into V8_0_0_BR
---

f2cde5cce2779acb64c69743f46c5a72b5ce281f
diff --cc src/HOMARDGUI/CMakeLists.txt
index d040fa7f,7fc25dd3..08efaccf
--- a/src/HOMARDGUI/CMakeLists.txt
+++ b/src/HOMARDGUI/CMakeLists.txt
@@@ -17,10 -17,11 +17,11 @@@
  # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
  #
  
 -INCLUDE(UseQt4Ext)
 -INCLUDE(UsePyQt4)
 +INCLUDE(UseQtExt)
 +INCLUDE(UsePyQt)
  
  # --- options ---
+ 
  # additional include directories
  INCLUDE_DIRECTORIES(
    ${QT_INCLUDES}
@@@ -85,21 -112,12 +112,12 @@@ SET(_moc_HEADER
    MonEditFile.h
  )
  
- # header files / no moc processing
+ # header files / uic wrappings
 -QT4_WRAP_UI(_uic_HEADERS ${_uic_FILES})
++QT_WRAP_UIC(_uic_HEADERS ${_uic_FILES})
+   
+ # header files / static
  SET(_other_HEADERS
-   CreateBoundaryAn.h
-   CreateBoundaryDi.h
-   CreateCase.h
-   CreateZone.h
-   CreateHypothesis.h
-   CreateListGroup.h
-   CreateIteration.h
-   PursueIteration.h
-   MeshInfo.h
-   IterInfo.h
-   CreateYACS.h
    HOMARDGUI_Utils.h
-   EditFile.h
    HomardQtCommun.h
    HOMARDGUI_Exports.hxx
  )