Merge V9_dev branch into master

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 98406d0b5cc6a615537d4f108f300bba8646b800..f48ff773c92687244632bb3299db5c1ff98b2ffe 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,7 +33,7 @@ ENDIF(WIN32)
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
 SET(${PROJECT_NAME_UC}_MAJOR_VERSION 8)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 4)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 5)
 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})

diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in
index a690d07193bae590c8f8811fb3fd2d0e0cc63fe5..3279a87394d7830f9bce972b456b8907aaf66679 100644 (file)
--- a/resources/SalomeApp.xml.in
+++ b/resources/SalomeApp.xml.in
@@ -31,11 +31,10 @@
     <parameter name="version"       value="@SALOMEMED_VERSION@"/>
   </section>
   <section name="med_help" >
-    <parameter name="sub_menu"          value="%1 module"/>
-    <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"/>
+    <parameter name="User's Guide/MED module/User's Guide"      value="%MED_ROOT_DIR%/share/doc/salome/dev/MED/index.html"/>    
+    <parameter name="User's Guide/MED module/MEDCoupling/User's Guide" value="%MEDCOUPLING_ROOT_DIR%/share/doc/index.html"/>
+    <parameter name="User's Guide/MED module/MEDCoupling/Tutorial" value="%MEDCOUPLING_ROOT_DIR%/share/doc/tutorial/index.html"/>
+    <parameter name="User's Guide/MED module/MEDFile/User Manual" value="%MEDFILE_ROOT_DIR%/share/doc/html.dox/index.html"/>
   </section>
   <section name="resources">
     <!-- Module resources -->

diff --git a/src/MEDGUI/CMakeLists.txt b/src/MEDGUI/CMakeLists.txt
index b44ef44e4220f550ecc9e9094026c622d50f2656..cbb8ddbc10a0b8282d1ddabd037d495e7127ae15 100644 (file)
--- a/src/MEDGUI/CMakeLists.txt
+++ b/src/MEDGUI/CMakeLists.txt
@@ -17,7 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-ADD_DEFINITIONS(${HDF5_DEFINITIONS} ${MEDFILE_DEFINITIONS} ${XDR_DEFINITIONS} ${CAS_DEFINITIONS} ${BOOST_DEFINITIONS} ${OMNIORB_DEFINITIONS})
+ADD_DEFINITIONS(${HDF5_DEFINITIONS} ${MEDFILE_DEFINITIONS} ${XDR_DEFINITIONS} ${BOOST_DEFINITIONS} ${OMNIORB_DEFINITIONS})
 
 INCLUDE(UseQtExt)
 
@@ -38,7 +38,6 @@ QT_WRAP_UIC(MEDGUI_FORMS_HEADERS ${MEDGUI_FORMS})
 
 INCLUDE_DIRECTORIES(
   ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS}
-  ${CAS_INCLUDE_DIRS}
   ${Boost_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIRS}
   ${GUI_INCLUDE_DIRS}
@@ -56,6 +55,6 @@ SET(MEDGUITS_SOURCES
 )
 
 ADD_LIBRARY(MEDGUI SHARED ${MEDGUI_SOURCES} ${MEDGUI_HEADERS_MOC} ${MEDGUI_FORMS_HEADERS})
-TARGET_LINK_LIBRARIES(MEDGUI medcalculator ${QT_MT_LIBS} ${CAS_KERNEL} ${BOOST_LIBRARIES} ${GUI_LDFLAGS} ${SalomeApp} ${CAM} ${LightApp} ${qtx} ${suit} ${SalomeObject} ${PLATFORM_LIBS} ${SalomeLifeCycleCORBA})
+TARGET_LINK_LIBRARIES(MEDGUI medcalculator ${QT_MT_LIBS} ${BOOST_LIBRARIES} ${GUI_LDFLAGS} ${SalomeApp} ${CAM} ${LightApp} ${qtx} ${suit} ${SalomeObject} ${PLATFORM_LIBS} ${SalomeLifeCycleCORBA})
 INSTALL(TARGETS MEDGUI DESTINATION ${SALOME_INSTALL_LIBS})
 QT_INSTALL_TS_RESOURCES("${MEDGUITS_SOURCES}" "${SALOME_MED_INSTALL_RES_DATA}")