From: vsr <vsr@opencascade.com>
Date: Fri, 13 Oct 2017 09:05:55 +0000 (+0300)
Subject: 0023473: [CEA 2163] SMESH compilation failure with a PyCompileError
X-Git-Tag: V8_4_0rc2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=69053df1afb855f0ae683b75622667c1767a1b4e;p=modules%2Fgeom.git

0023473: [CEA 2163] SMESH compilation failure with a PyCompileError
- Add direct dependencies between targets generated by PYQT_WRAP_UIC and SALOME_INSTALL_SCRIPTS macros to avoid races problem
---

diff --git a/src/Tools/t_shape/CMakeLists.txt b/src/Tools/t_shape/CMakeLists.txt
index 7f9ffdaf0..b25c0db31 100644
--- a/src/Tools/t_shape/CMakeLists.txt
+++ b/src/Tools/t_shape/CMakeLists.txt
@@ -24,33 +24,36 @@ ENDIF()
 # --- scripts ---
 
 # base scripts
-SET(base_SCRIPTS
+SET(_base_SCRIPTS
   __init__.py
   t_shape_builder.py
   )
 
 IF(SALOME_BUILD_GUI)
    # gui scripts 
-   SET(gui_SCRIPTS
+   SET(_gui_SCRIPTS
      t_shape_dialog.py
      t_shape_dialog.ui
      t_shape_progress.py
      )
 
   # uic files / to be processed by pyuic
-  SET(_pyuic_files
+  SET(_pyuic_FILES
     t_shape_dialog.ui
     )
 
   # scripts / pyuic wrappings
-  PYQT_WRAP_UIC(_pyuic_SCRIPTS ${_pyuic_files})
+  PYQT_WRAP_UIC(_pyuic_SCRIPTS ${_pyuic_FILES} TARGET_NAME _target_name_pyuic)
 ENDIF()
 
 # --- rules ---
 
-SALOME_INSTALL_SCRIPTS("${base_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/geom/t_shape)
+SALOME_INSTALL_SCRIPTS("${_base_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/geom/t_shape)
 
 IF(SALOME_BUILD_GUI)
-  SALOME_INSTALL_SCRIPTS("${gui_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/geom/t_shape)
-  SALOME_INSTALL_SCRIPTS("${_pyuic_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/geom/t_shape)
-ENDIF()
\ No newline at end of file
+  SALOME_INSTALL_SCRIPTS("${_gui_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/geom/t_shape)
+  SALOME_INSTALL_SCRIPTS("${_pyuic_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/geom/t_shape TARGET_NAME _target_name_pyuic_py)
+  # add dependency of compiled py files on uic files in order
+  # to avoid races problems when compiling in parallel
+  ADD_DEPENDENCIES(${_target_name_pyuic_py} ${_target_name_pyuic})
+ENDIF()