Cmake: add dependency for usr_docs target

diff --git a/doc/salome/gui/CMakeLists.txt b/doc/salome/gui/CMakeLists.txt
index 0d0992e3868233e6e30a8889a30633cbe84a3eeb..8bd8df903d5cacc2748f55af31da0d859c8063cf 100755 (executable)
--- a/doc/salome/gui/CMakeLists.txt
+++ b/doc/salome/gui/CMakeLists.txt
@@ -32,4 +32,4 @@ ADD_CUSTOM_TARGET(usr_docs ${DOXYGEN_EXECUTABLE}
  VERBATIM 
  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
 )
-
+ADD_DEPENDENCIES(usr_docs html_docs)

diff --git a/salome_adm/cmake_files/am2cmake.py b/salome_adm/cmake_files/am2cmake.py
index 4832e18f5e41a3766028a883b91a062e2693ca36..838b032749e8246504a8cc6b22357cc8b576ed9f 100644 (file)
--- a/salome_adm/cmake_files/am2cmake.py
+++ b/salome_adm/cmake_files/am2cmake.py
@@ -1243,6 +1243,7 @@ class CMakeFile(object):
                 VERBATIM 
                 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}             
                 )"""%(prepare_generating_doc_src, prepare_generating_doc_src, tmp, upmod, tmp, tmp, input, tmp, doc_gui_destination, doc_gui_destination, ign, head_source, doc_gui_destination))
+                newlines.append(r"""ADD_DEPENDENCIES(usr_docs html_docs)""")
             else:
                 config_f = ""
                if mod in ['netgenplugin','blsurfplugin','hexoticplugin','ghs3dplugin', "ghs3dprlplugin"] :
@@ -2469,7 +2470,7 @@ class CMakeFile(object):
             path = "PATH"
             begin = "%"
             end = "%"
-            delim = ";"
+            delim = "\;"
             cmd = "@SET "
             omni = "/x86_win32"
             omni_py = "/python"
@@ -2501,13 +2502,13 @@ class CMakeFile(object):
         script = script + cmd + " "+ path + "=" + root_dir_+"/lib/salome"+ _path_
 
        if upmod == "KERNEL" :
-            script = script + cmd + " " +  python_path + "=" + _pdir + \
-            "/omniORB-4.1.5/lib" + omni + _python_path_
+            script = script + cmd + " " +  python_path + "=" + "${OMNIORB_ROOT_USER}" + "/lib" + \
+            omni + _python_path_
         
-            script = script + cmd + " " + python_path + "=" + _pdir + \
-            "/omniORB-4.1.5/lib" + omni_py + _python_path_
+            script = script + cmd + " " + python_path + "=" + "${OMNIORB_ROOT_USER}" + "/lib" + \
+            omni_py + _python_path_
         
-            script = script + cmd + " "+ path + "=" + _pdir+ "/omniORB-4.1.5/lib" + \
+            script = script + cmd + " "+ path + "=" + "${OMNIORB_ROOT_USER}" + "/lib" + \
             omni + _path_
 
         if upmod == "GEOM" :