ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-12-26 17:30:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

0023473: [CEA 2163] SMESH compilation failure with a PyCompileError

Browse Source 
- Add direct dependencies between targets generated by PYQT_WRAP_UIC and SALOME_INSTALL_SCRIPTS macros to avoid races problem
This commit is contained in:
vsr 2017-10-13 12:05:55 +03:00
parent c24f6c6618
commit 7714104ece
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Tools/t_shape/CMakeLists.txt
View File

@ -24,33 +24,36 @@ ENDIF()
# --- scripts --- # --- scripts ---
# base scripts # base scripts
SET(base_SCRIPTS SET(_base_SCRIPTS
__init__.py __init__.py
t_shape_builder.py t_shape_builder.py
) )
IF(SALOME_BUILD_GUI) IF(SALOME_BUILD_GUI)
# gui scripts # gui scripts
SET(gui_SCRIPTS SET(_gui_SCRIPTS
t_shape_dialog.py t_shape_dialog.py
t_shape_dialog.ui t_shape_dialog.ui
t_shape_progress.py t_shape_progress.py
) )
# uic files / to be processed by pyuic # uic files / to be processed by pyuic
SET(_pyuic_files SET(_pyuic_FILES
t_shape_dialog.ui t_shape_dialog.ui
) )
# scripts / pyuic wrappings # scripts / pyuic wrappings
PYQT_WRAP_UIC(_pyuic_SCRIPTS ${_pyuic_files}) PYQT_WRAP_UIC(_pyuic_SCRIPTS ${_pyuic_FILES} TARGET_NAME _target_name_pyuic)
ENDIF() ENDIF()
# --- rules --- # --- 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) IF(SALOME_BUILD_GUI)
SALOME_INSTALL_SCRIPTS("${gui_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/geom/t_shape) SALOME_INSTALL_SCRIPTS("${_gui_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/geom/t_shape)
SALOME_INSTALL_SCRIPTS("${_pyuic_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() ENDIF()