From: vsr <vsr@opencascade.com>
Date: Fri, 15 Mar 2013 14:52:32 +0000 (+0000)
Subject: Merge from V6_main 15/03/2013
X-Git-Tag: V7_1_0~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=aad5a1f18c399dad79343f610423c731c5695ef0;p=plugins%2Fhexoticplugin.git

Merge from V6_main 15/03/2013
---

diff --git a/doc/salome/gui/HexoticPLUGIN/CMakeLists.txt b/doc/salome/gui/HexoticPLUGIN/CMakeLists.txt
index d49781b..5576137 100755
--- a/doc/salome/gui/HexoticPLUGIN/CMakeLists.txt
+++ b/doc/salome/gui/HexoticPLUGIN/CMakeLists.txt
@@ -23,7 +23,7 @@ SET(top_builddir ${CMAKE_BINARY_DIR})
 SET(top_srcdir ${CMAKE_SOURCE_DIR})
 SET(srcdir ${CMAKE_CURRENT_SOURCE_DIR})
 SET(builddir ${CMAKE_CURRENT_BINARY_DIR})
-SET(datadir${CMAKE_INSTALL_PREFIX}/share)
+SET(datadir ${CMAKE_INSTALL_PREFIX}/share)
 SET(docdir ${datadir}/doc/salome)
 SET(guidocdir ${docdir}/gui/HexoticPLUGIN)
 
@@ -56,7 +56,9 @@ IF(WINDOWS)
   SET(CALL_STR "call")
 ELSE(WINDOWS)
   SET(DOC_PYTHONPATH ${CMAKE_INSTALL_PREFIX}/bin/salome:${SMESH_ROOT_DIR}/bin/salome:${SMESH_ROOT_DIR}/lib/python${PYTHON_VERSION}/site-packages/salome:${MED_ROOT_DIR}/lib/python${PYTHON_VERSION}/site-packages/salome:${GEOM_ROOT_DIR}/bin/salome:${GEOM_ROOT_DIR}/lib/python${PYTHON_VERSION}/site-packages/salome:${KERNEL_ROOT_DIR}/bin/salome:${KERNEL_ROOT_DIR}/lib/python${PYTHON_VERSION}/site-packages/salome:${OMNIORB_ROOT_USER}/lib/python${PYTHON_VERSION}/site-packages:${OMNIORB_ROOT_USER}/lib64/python${PYTHON_VERSION}/site-packages)
-  SET(SCR "export PYTHONPATH=${DOC_PYTHONPATH}:${PYTHONPATH}
+  SET(DOC_LD_LIBRARY_PATH "${CMAKE_INSTALL_PREFIX}/lib/salome:${SMESH_ROOT_DIR}/lib/salome:${MED_ROOT_DIR}/lib/salome:${GEOM_ROOT_DIR}/lib/salome:${KERNEL_ROOT_DIR}/lib/salome")
+  SET(SCR "export PYTHONPATH=${DOC_PYTHONPATH}:\${PYTHONPATH}
+  export LD_LIBRARY_PATH=${DOC_LD_LIBRARY_PATH}:\${LD_LIBRARY_PATH}
   export SMESH_MeshersList=${DOC_SMESH_MeshersList}
   ")
   SET(EXT "sh")
diff --git a/doc/salome/gui/HexoticPLUGIN/static/header.html.in b/doc/salome/gui/HexoticPLUGIN/static/header.html.in
index 4571b43..d434d83 100755
--- a/doc/salome/gui/HexoticPLUGIN/static/header.html.in
+++ b/doc/salome/gui/HexoticPLUGIN/static/header.html.in
@@ -5,6 +5,8 @@
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>$title</title>
 <link href="$relpath$tabs.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="$relpath^jquery.js"></script>
+<script type="text/javascript" src="$relpath^dynsections.js"></script>
 $treeview
 $search
 $mathjax
diff --git a/doc/salome/gui/HexoticPLUGIN/static/header_py.html.in b/doc/salome/gui/HexoticPLUGIN/static/header_py.html.in
index 61414bb..22abb14 100644
--- a/doc/salome/gui/HexoticPLUGIN/static/header_py.html.in
+++ b/doc/salome/gui/HexoticPLUGIN/static/header_py.html.in
@@ -5,6 +5,8 @@
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>$title</title>
 <link href="$relpath$tabs.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="$relpath^jquery.js"></script>
+<script type="text/javascript" src="$relpath^dynsections.js"></script>
 $treeview
 $search
 $mathjax