Merge relevant changes from V8_0_0_BR branch

diff --git a/SalomeMEDConfig.cmake.in b/SalomeMEDConfig.cmake.in
index 76ebd015fa8b01c610834f5be615e1d21a6fadd8..3e5ecddbb34fa8bcb614c3936778458e0a8d0b05 100644 (file)
--- a/SalomeMEDConfig.cmake.in
+++ b/SalomeMEDConfig.cmake.in
@@ -69,29 +69,31 @@ ENDIF(SALOME_MED_BUILD_GUI)
 # For all prerequisites, load the corresponding targets if the package was used
 # in CONFIG mode. This ensures dependent projects link correctly
 # without having to set LD_LIBRARY_PATH:
-SET(_PREREQ @_PREREQ_LIST@)
-SET(_PREREQ_CONFIG_DIR @_PREREQ_DIR_LIST@)
-SET(_PREREQ_COMPONENTS "@_PREREQ_COMPO_LIST@")
-LIST(LENGTH _PREREQ_CONFIG_DIR _list_len)
-IF(NOT _list_len EQUAL 0)
+SET(_PREREQ_@PROJECT_NAME@ @_PREREQ_LIST@)
+SET(_PREREQ_@PROJECT_NAME@_CONFIG_DIR @_PREREQ_DIR_LIST@)
+SET(_PREREQ_@PROJECT_NAME@_COMPONENTS "@_PREREQ_COMPO_LIST@")
+LIST(LENGTH _PREREQ_@PROJECT_NAME@_CONFIG_DIR _list_len_@PROJECT_NAME@)
+IF(NOT _list_len_@PROJECT_NAME@ EQUAL 0)
   # Another CMake stupidity - FOREACH(... RANGE r) generates r+1 numbers ...
-  MATH(EXPR _range "${_list_len}-1")
-  FOREACH(_p RANGE ${_range})
-    LIST(GET _PREREQ            ${_p} _pkg    )
-    LIST(GET _PREREQ_CONFIG_DIR ${_p} _pkg_dir)
-    LIST(GET _PREREQ_COMPONENTS ${_p} _pkg_compo)
-    MESSAGE(STATUS "===> Reloading targets from ${_pkg} ...")
-    IF(NOT _pkg_compo)
-      FIND_PACKAGE(${_pkg} REQUIRED NO_MODULE
-          PATHS "${_pkg_dir}"
-          NO_DEFAULT_PATH)
-    ELSE()
-      STRING(REPLACE "," ";" _compo_lst "${_pkg_compo}")
-      MESSAGE(STATUS "===> (components: ${_pkg_compo})")
-      FIND_PACKAGE(${_pkg} REQUIRED NO_MODULE
-          COMPONENTS ${_compo_lst}
-          PATHS "${_pkg_dir}"
-          NO_DEFAULT_PATH)
+  MATH(EXPR _range_@PROJECT_NAME@ "${_list_len_@PROJECT_NAME@}-1")
+  FOREACH(_p_@PROJECT_NAME@ RANGE ${_range_@PROJECT_NAME@})
+    LIST(GET _PREREQ_@PROJECT_NAME@            ${_p_@PROJECT_NAME@} _pkg_@PROJECT_NAME@    )
+    LIST(GET _PREREQ_@PROJECT_NAME@_CONFIG_DIR ${_p_@PROJECT_NAME@} _pkg_dir_@PROJECT_NAME@)
+    LIST(GET _PREREQ_@PROJECT_NAME@_COMPONENTS ${_p_@PROJECT_NAME@} _pkg_compo_@PROJECT_NAME@)
+    IF(NOT OMIT_DETECT_PACKAGE_${_pkg_@PROJECT_NAME@})
+      MESSAGE(STATUS "===> Reloading targets from ${_pkg_@PROJECT_NAME@} ...")
+      IF(NOT _pkg_compo_@PROJECT_NAME@)
+        FIND_PACKAGE(${_pkg_@PROJECT_NAME@} REQUIRED NO_MODULE
+            PATHS "${_pkg_dir_@PROJECT_NAME@}"
+            NO_DEFAULT_PATH)
+      ELSE()
+        STRING(REPLACE "," ";" _compo_lst_@PROJECT_NAME@ "${_pkg_compo_@PROJECT_NAME@}")
+        MESSAGE(STATUS "===> (components: ${_pkg_compo_@PROJECT_NAME@})")
+        FIND_PACKAGE(${_pkg_@PROJECT_NAME@} REQUIRED NO_MODULE
+            COMPONENTS ${_compo_lst_@PROJECT_NAME@}
+            PATHS "${_pkg_dir_@PROJECT_NAME@}"
+            NO_DEFAULT_PATH)
+      ENDIF()
     ENDIF()
   ENDFOREACH()
 ENDIF()

diff --git a/doc/dev/sphinx/conf.py.in b/doc/dev/sphinx/conf.py.in
index acf020698069ca2e75a56974e1d9f9de0d9a405e..8150efa31388db018dcb06a90f5fa17b1fc6320f 100644 (file)
--- a/doc/dev/sphinx/conf.py.in
+++ b/doc/dev/sphinx/conf.py.in
@@ -103,7 +103,7 @@ pygments_style = 'sphinx'
 
 # The theme to use for HTML and HTML Help pages.  Major themes that come with
 # Sphinx are currently 'default' and 'sphinxdoc'.
-html_theme = 'basic'
+html_theme = '@SPHINX_THEME@'
 html_theme_options = {
 }
 

diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in
index ce9d1ca10612fd557f0809070578900b760cd123..e5819b0af3809ddeeb7cf92d48d9fe24ed9bb8f3 100644 (file)
--- a/resources/SalomeApp.xml.in
+++ b/resources/SalomeApp.xml.in
@@ -32,9 +32,10 @@
   </section>
   <section name="med_help" >
     <parameter name="sub_menu"          value="%1 module"/>
-    <parameter name="User's Guide"      value="%MED_ROOT_DIR%/share/doc/salome/gui/MED/index.html"/>
-    <parameter name="Developer's Guide" value="%MED_ROOT_DIR%/share/doc/salome/tui/MED/index.html"/>
-    <parameter name="Medfichier" value="%MED3HOME%/share/doc/html/index.html"/>
+    <parameter name="User's Guide"      value="%MED_ROOT_DIR%/share/doc/salome/dev/MED/index.html"/>
+    <parameter name="MEDCoupling/User's Guide" value="%MEDCOUPLING_ROOT_DIR%/share/doc/index.html"/>
+    <parameter name="MEDCoupling/Tutorial" value="%MEDCOUPLING_ROOT_DIR%/share/doc/tutorial/index.html"/>
+    <parameter name="MEDFile/User Manual" value="%MEDFILE_ROOT_DIR%/share/doc/html.dox/index.html"/>
   </section>
   <section name="resources">
     <!-- Module resources -->