Fix for the issue #1480 : make documentation targets near to SALOME common rules

diff --git a/doc/gui/CMakeLists.txt b/doc/gui/CMakeLists.txt
index d075f75e7968a580b4050b841bfdfa03827a23d3..8fc8df70a1cada23fa50f4a2fe06e42969cb1ac3 100644 (file)
--- a/doc/gui/CMakeLists.txt
+++ b/doc/gui/CMakeLists.txt
@@ -4,9 +4,11 @@ SET(HTML_RESOURCES
   index.html
 )
 
-ADD_CUSTOM_TARGET(INSTALL_GUI_DOCS
+ADD_CUSTOM_TARGET(usr_docs
     SOURCES ${HTML_RESOURCES}
     COMMAND "${CMAKE_COMMAND}" --build "${PROJECT_BINARY_DIR}" --target install --config ${CMAKE_BUILD_TYPE}
     WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/doc/gui"
 )
 INSTALL(FILES ${HTML_RESOURCES} DESTINATION ${SHAPER_INSTALL_GUI_DOC} OPTIONAL)
+
+INSTALL(CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build ${PROJECT_BINARY_DIR} --target usr_docs)")

diff --git a/doc/tui/CMakeLists.txt b/doc/tui/CMakeLists.txt
index d5c50f223184e0f59ef1b44f8775c94461dea739..2c0f54b346fd80f9487ca7a363d00e90d1b7a610 100644 (file)
--- a/doc/tui/CMakeLists.txt
+++ b/doc/tui/CMakeLists.txt
@@ -16,7 +16,7 @@ CONFIGURE_FILE(doxyfile.in
                "${CMAKE_CURRENT_BINARY_DIR}/doxyfile"
                IMMEDIATE @ONLY)
 
-ADD_CUSTOM_TARGET(INSTALL_TUI_DOCS
+ADD_CUSTOM_TARGET(dev_docs
     COMMAND "${DOXYGEN_EXECUTABLE}"
     COMMAND "${CMAKE_COMMAND}" --build "${PROJECT_BINARY_DIR}" --target install --config ${CMAKE_BUILD_TYPE}
     WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/doc/tui"

diff --git a/src/Config/Config_DataModelReader.h b/src/Config/Config_DataModelReader.h
old mode 100644 (file)
new mode 100755 (executable)
index d40fee1..a66ad0f
--- a/src/Config/Config_DataModelReader.h
+++ b/src/Config/Config_DataModelReader.h
@@ -36,7 +36,7 @@ class Config_DataModelReader : public Config_XMLReader
   CONFIG_EXPORT std::string rootType() const { return myRootTypes; }
 
   /// Returns number of folders under root 
-  CONFIG_EXPORT int rootFoldersNumber() const { return int(myRootFolderNames.size()); }
+  CONFIG_EXPORT size_t rootFoldersNumber() const { return myRootFolderNames.size(); }
 
   /// Returns name of the folder by its Id
   /// \param theId id of the folder
@@ -68,7 +68,7 @@ class Config_DataModelReader : public Config_XMLReader
   CONFIG_EXPORT std::string subType() const { return mySubTypes; }
 
   /// Returns number of folders under sub document 
-  CONFIG_EXPORT int subFoldersNumber() const { return int(mySubFolderNames.size()); }
+  CONFIG_EXPORT size_t subFoldersNumber() const { return mySubFolderNames.size(); }
 
   /// Returns name of the folder by its Id
   /// \param theId id of the folder

diff --git a/src/Model/Model_Update.cpp b/src/Model/Model_Update.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 3bec297..3b7896a
--- a/src/Model/Model_Update.cpp
+++ b/src/Model/Model_Update.cpp
@@ -80,6 +80,8 @@ bool Model_Update::addModified(FeaturePtr theFeature, FeaturePtr theReason) {
 #ifdef DEB_UPDATE
       std::cout<<"*** Add process on finish "<<theFeature->name()<<std::endl;
 #endif
+    // keeps the currently updated features to avoid infinitive cycling here: where feature on
+    // "updateArguments" sends "updated" (in selection attribute) and goes here again
     static std::set<FeaturePtr> aCurrentlyUpdated;
     if (aCurrentlyUpdated.find(theFeature) == aCurrentlyUpdated.end()) {
       aCurrentlyUpdated.insert(theFeature);