From: rnv <rnv@opencascade.com>
Date: Thu, 7 Jun 2018 12:17:10 +0000 (+0300)
Subject: Merge V9_dev branch into master
X-Git-Tag: SHAPER_V9_1_0RC1~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=2d7bb9682c96830ca4d0c3ffe3905245645d8032;hp=fd6ece745c013178e78db978d9c2e196f37685eb;p=plugins%2Fgmshplugin.git

Merge V9_dev branch into master
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3486521..f72b09e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,7 +32,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})
@@ -129,7 +129,7 @@ IF(SALOME_BUILD_GUI)
   ENDIF()
 ENDIF(SALOME_BUILD_GUI)
 # OCCT
-FIND_PACKAGE(SalomeCAS REQUIRED)
+FIND_PACKAGE(SalomeOpenCASCADE REQUIRED)
 # VTK
 FIND_PACKAGE(SalomeVTK REQUIRED)
 
diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml
index 621a80b..19fcdbb 100644
--- a/resources/SalomeApp.xml
+++ b/resources/SalomeApp.xml
@@ -28,6 +28,6 @@
     <parameter name="plugins" value="GMSHPlugin"/>
   </section>
   <section name="smesh_help">
-    <parameter name="Plug-ins/GMSH plugin User's Guide" value="${GMSHPLUGIN_ROOT_DIR}/share/doc/salome/gui/GMSHPLUGIN/index.html"/>
+    <parameter name="User's Guide/Mesh module/Plug-ins/GMSH plugin" value="${GMSHPLUGIN_ROOT_DIR}/share/doc/salome/gui/GMSHPLUGIN/index.html"/>
   </section>
 </document>
diff --git a/src/GMSHPlugin/CMakeLists.txt b/src/GMSHPlugin/CMakeLists.txt
index 41f0eec..eea97b5 100644
--- a/src/GMSHPlugin/CMakeLists.txt
+++ b/src/GMSHPlugin/CMakeLists.txt
@@ -22,7 +22,7 @@
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${KERNEL_INCLUDE_DIRS}
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${GEOM_INCLUDE_DIRS}
   ${SMESH_INCLUDE_DIRS}
   ${VTK_INCLUDE_DIRS}
@@ -35,21 +35,16 @@ INCLUDE_DIRECTORIES(
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(  
   ${OMNIORB_DEFINITIONS}
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${BOOST_DEFINITIONS}
 )
 
 # libraries to link to
 SET(_link_LIBRARIES
-  ${CAS_TKernel}
-  ${CAS_TKMath}
-  ${CAS_TKBRep}
-  ${CAS_TKGeomBase}
-  ${CAS_TKG2d}
-  ${CAS_TKG3d}
-  ${CAS_TKTopAlgo}
-  ${CAS_TKGeomAlgo}
-  ${CAS_TKCDF}
+  ${OpenCASCADE_FoundationClasses_LIBRARIES}
+  ${OpenCASCADE_ModelingData_LIBRARIES}
+  ${OpenCASCADE_ApplicationFramework_LIBRARIES}
+  ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
   ${GMSH_LIBRARIES}
   ${KERNEL_SALOMELocalTrace}
   ${KERNEL_SALOMEBasics}
diff --git a/src/GUI/CMakeLists.txt b/src/GUI/CMakeLists.txt
index 91cb3a8..3786d30 100644
--- a/src/GUI/CMakeLists.txt
+++ b/src/GUI/CMakeLists.txt
@@ -24,7 +24,7 @@ INCLUDE(UseQtExt)
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${QT_INCLUDES}
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${KERNEL_INCLUDE_DIRS}
   ${GUI_INCLUDE_DIRS}
   ${GEOM_INCLUDE_DIRS}
@@ -40,7 +40,7 @@ INCLUDE_DIRECTORIES(
 ADD_DEFINITIONS(
   ${QT_DEFINITIONS}
   ${OMNIORB_DEFINITIONS}
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${BOOST_DEFINITIONS}
 )
 
@@ -56,7 +56,7 @@ SET(_link_LIBRARIES
   ${GUI_suit}
   ${GUI_qtx}
   ${GUI_SalomeApp}
-  ${CAS_KERNEL}
+  ${OpenCASCADE_FoundationClasses_LIBRARIES}
   SalomeIDLGMSHPLUGIN
 )