Merge V8_4_BR branch.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8a60ec832dede020a755591bf12dbd756a899e6d..b72c45572bf937322d920c3af975075aa4e9dae1 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,7 +33,7 @@ SET(${PROJECT_NAME_UC}_MINOR_VERSION 4)
 SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
-SET(${PROJECT_NAME_UC}_VERSION_DEV 0)
+SET(${PROJECT_NAME_UC}_VERSION_DEV 1)
 
 # Common CMake macros
 # ===================

diff --git a/src/ATOMGENGUI/CMakeLists.txt b/src/ATOMGENGUI/CMakeLists.txt
index 1e49e56973c54ea8d915a9e4e8edfaa51ace8c38..dbce18131307134ae78a1fd74cef6975f66e0be1 100755 (executable)
--- a/src/ATOMGENGUI/CMakeLists.txt
+++ b/src/ATOMGENGUI/CMakeLists.txt
@@ -30,12 +30,12 @@ SET(_bin_SCRIPTS
 # --- resources ---
 
 # uic files / to be processed by pyuic
-SET(_pyuic_files
+SET(_pyuic_FILES
   rundlg.ui
 )
 
 # scripts / pyuic wrappings
-PYQT_WRAP_UIC(_pyuic_SCRIPTS ${_pyuic_files})
+PYQT_WRAP_UIC(_pyuic_SCRIPTS ${_pyuic_FILES} TARGET_NAME _target_name_pyuic)
 
 # resource files / to be processed by lrelease
 SET(_ts_RESOURCES
@@ -44,9 +44,12 @@ SET(_ts_RESOURCES
   resources/ATOMGEN_msg_ja.ts
 )
 
-SET(_all_SCRIPTS ${_bin_SCRIPTS} ${_pyuic_SCRIPTS})
-
 # --- rules ---
 
-SALOME_INSTALL_SCRIPTS("${_all_SCRIPTS}" ${SALOME_INSTALL_SCRIPT_PYTHON})
+SALOME_INSTALL_SCRIPTS("${_bin_SCRIPTS}" ${SALOME_INSTALL_SCRIPT_PYTHON})
+SALOME_INSTALL_SCRIPTS("${_pyuic_SCRIPTS}" ${SALOME_INSTALL_SCRIPT_PYTHON} 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})
+
 QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_ATOMGEN_INSTALL_RES_DATA}")