Merge remote branch 'origin/V7_dev'

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a739d1664f45dc6e60dd9d4b073fd193eabe5f68..2150a8b5f9408b59dfbb6befcd9f1d6b5e1e52f3 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,8 +28,8 @@ CMAKE_POLICY(SET CMP0003 NEW)
 # Project name, upper case
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
-SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 8)
+SET(${PROJECT_NAME_UC}_MAJOR_VERSION 8)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 0)
 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})
@@ -112,7 +112,11 @@ FIND_PACKAGE(SalomeCR REQUIRED)
 FIND_PACKAGE(SalomeOmniORB REQUIRED)
 FIND_PACKAGE(SalomeOmniORBPy REQUIRED)
 IF(SALOME_BUILD_GUI)
-  FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
+  IF(NOT SALOME_GUI_BUILD_WITH_QT5)
+    FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
+  ELSE()
+    FIND_PACKAGE(SalomeQt5 REQUIRED)
+  ENDIF()
 ENDIF(SALOME_BUILD_GUI)
 IF(SALOME_BUILD_DOC)
   FIND_PACKAGE(SalomeDoxygen)

diff --git a/adm_local/cmake_files/FindCR.cmake b/adm_local/cmake_files/FindCR.cmake
index ffc1203958554b49794f9745eeea7c2725a51266..b42dd48bbe757d13e757c808158cb2908b9f403e 100644 (file)
--- a/adm_local/cmake_files/FindCR.cmake
+++ b/adm_local/cmake_files/FindCR.cmake
@@ -40,14 +40,29 @@ IF(OCCLICENSE_ROOT_DIR)
   LIST(APPEND CMAKE_PREFIX_PATH "${OCCLICENSE_ROOT_DIR}")
 ENDIF(OCCLICENSE_ROOT_DIR)
 
-FIND_PATH(CR_INCLUDE_DIRS ShapeConvert.hxx PATH_SUFFIXES inc)
-FIND_PATH(OCCTLICENSE_INCLUDE_DIRS OCCLicense_Activate.hxx PATH_SUFFIXES inc)
-IF(OCCTLICENSE_INCLUDE_DIRS)
-  LIST(APPEND CR_INCLUDE_DIRS ${OCCTLICENSE_INCLUDE_DIRS})
-ENDIF(OCCTLICENSE_INCLUDE_DIRS)
-
-FIND_LIBRARY(CR_TKCR NAMES TKCR)
-FIND_LIBRARY(CRKOCCLicense NAMES TKOCCLicense)
+FIND_PATH(CR_INCLUDE_DIRS ShapeConvert.hxx PATH_SUFFIXES include/opencascade)
+IF(CR_INCLUDE_DIRS)
+  SET(CR_UPCOUNT 2)
+ELSE(CR_INCLUDE_DIRS)
+  FIND_PATH(CR_INCLUDE_DIRS ShapeConvert.hxx PATH_SUFFIXES include inc)
+ENDIF(CR_INCLUDE_DIRS)
+
+FIND_PATH(OCCTLICENSE_INCLUDE_DIRS OCCLicense_Activate.hxx PATH_SUFFIXES include/opencascade)
+IF(NOT OCCTLICENSE_INCLUDE_DIRS)
+  FIND_PATH(OCCTLICENSE_INCLUDE_DIRS OCCLicense_Activate.hxx PATH_SUFFIXES include inc)
+ENDIF(NOT OCCTLICENSE_INCLUDE_DIRS)
+
+IF(CR_INCLUDE_DIRS AND OCCTLICENSE_INCLUDE_DIRS)
+  FILE(TO_NATIVE_PATH ${CR_INCLUDE_DIRS} _cr_dir)
+  FILE(TO_NATIVE_PATH ${OCCTLICENSE_INCLUDE_DIRS} _lic_dir)
+  STRING(COMPARE NOTEQUAL ${_cr_dir} ${_lic_dir} _diff_dir)
+  IF(_diff_dir)
+    LIST(APPEND CR_INCLUDE_DIRS ${OCCTLICENSE_INCLUDE_DIRS})
+  ENDIF()
+ENDIF(CR_INCLUDE_DIRS AND OCCTLICENSE_INCLUDE_DIRS)
+
+FIND_LIBRARY(CR_TKCR NAMES TKCR PATH_SUFFIXES lib lin64/gcc/lib bin)
+FIND_LIBRARY(CRKOCCLicense NAMES TKOCCLicense PATH_SUFFIXES lib lin64/gcc/lib bin)
 
 SET(CR_LIBRARIES
   ${CR_TKCR}

diff --git a/src/CANRECPLUGINEngine/CANRECPluginEngine_IOperations_i.cc b/src/CANRECPLUGINEngine/CANRECPluginEngine_IOperations_i.cc
index e4412373a2899537a8349e1f105223de96198c4c..23cf75972789301fd235896bf0f25ae77d93360a 100644 (file)
--- a/src/CANRECPLUGINEngine/CANRECPluginEngine_IOperations_i.cc
+++ b/src/CANRECPLUGINEngine/CANRECPluginEngine_IOperations_i.cc
@@ -58,7 +58,7 @@ CANRECPluginEngine_IOperations_i::MakeCanonicalRecognition( GEOM::GEOM_Object_pt
   GetOperations()->SetNotDone();
 
   // Get the reference points
-  Handle(GEOM_Object) anInitObject = GetObjectImpl( theObject );
+  HANDLE_NAMESPACE(GEOM_Object) anInitObject = GetObjectImpl( theObject );
 
   if ( anInitObject.IsNull() ) {
     return GEOM::GEOM_Object::_nil();
@@ -66,7 +66,7 @@ CANRECPluginEngine_IOperations_i::MakeCanonicalRecognition( GEOM::GEOM_Object_pt
 
   // Make Canonical Recognition
   Handle(TColStd_HSequenceOfInteger) aStat    = new TColStd_HSequenceOfInteger;
-  Handle(GEOM_Object)                anObject =
+  HANDLE_NAMESPACE(GEOM_Object)      anObject =
         GetOperations()->MakeCanonicalRecognition(anInitObject,
                                                   theMergeSurf, 
                                                   theMergeCurves, 
@@ -106,7 +106,7 @@ CORBA::Long CANRECPluginEngine_IOperations_i::GetNbCanonicalFaces
   GetOperations()->SetNotDone();
 
   // Get the reference points
-  Handle(GEOM_Object) anInitObject = GetObjectImpl(theObject);
+  HANDLE_NAMESPACE(GEOM_Object) anInitObject = GetObjectImpl(theObject);
 
   if (anInitObject.IsNull()) {
     return -1;

diff --git a/src/CANRECPLUGINEngine/CANRECPluginImpl_Driver.cxx b/src/CANRECPLUGINEngine/CANRECPluginImpl_Driver.cxx
index d7ae257a553c36bb5942e6282be5985bcec2c186..a0f400a0bf5884bf5b2e4661232153db5a75f391 100644 (file)
--- a/src/CANRECPLUGINEngine/CANRECPluginImpl_Driver.cxx
+++ b/src/CANRECPLUGINEngine/CANRECPluginImpl_Driver.cxx
@@ -103,16 +103,16 @@ CANRECPluginImpl_Driver::~CANRECPluginImpl_Driver()
 {
 }
 
-Standard_Boolean CANRECPluginImpl_Driver::MustExecute( const TFunction_Logbook& ) const
+Standard_Boolean CANRECPluginImpl_Driver::MustExecute( const LOGBOOK& ) const
 {
   return Standard_True;
 }
 
-void CANRECPluginImpl_Driver::Validate( TFunction_Logbook& ) const
+void CANRECPluginImpl_Driver::Validate( LOGBOOK& ) const
 {
 } 
 
-Standard_Integer CANRECPluginImpl_Driver::Execute( TFunction_Logbook& log ) const
+Standard_Integer CANRECPluginImpl_Driver::Execute( LOGBOOK& log ) const
 {
   if ( Label().IsNull() ) return 0;
   Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() );
@@ -189,7 +189,11 @@ Standard_Integer CANRECPluginImpl_Driver::Execute( TFunction_Logbook& log ) cons
 
   aFunction->SetValue( aResultingShape );
 
+#if OCC_VERSION_MAJOR < 7
   log.SetTouched( Label() );
+#else
+  log->SetTouched( Label() );
+#endif
   
   return 1;
 }
@@ -212,5 +216,4 @@ GetCreationInformation( std::string&             theOperationName,
   return true;
 }
 
-IMPLEMENT_STANDARD_HANDLE( CANRECPluginImpl_Driver, GEOM_BaseDriver );
-IMPLEMENT_STANDARD_RTTIEXT( CANRECPluginImpl_Driver, GEOM_BaseDriver );
+OCCT_IMPLEMENT_STANDARD_RTTIEXT( CANRECPluginImpl_Driver,GEOM_BaseDriver );

diff --git a/src/CANRECPLUGINEngine/CANRECPluginImpl_Driver.hxx b/src/CANRECPLUGINEngine/CANRECPluginImpl_Driver.hxx
index f7ddb1465b6c822c9b810838fb71bff3b3fb5603..ee442d9dc244f5f5f6061a3af1d312a1650e96e5 100644 (file)
--- a/src/CANRECPLUGINEngine/CANRECPluginImpl_Driver.hxx
+++ b/src/CANRECPLUGINEngine/CANRECPluginImpl_Driver.hxx
@@ -34,14 +34,14 @@ public:
 
   static const Standard_GUID& GetID();
   static Standard_Integer GetNbCanonicalFaces(const TopoDS_Shape &theShape);
-  virtual Standard_Integer Execute( TFunction_Logbook& ) const; 
-  Standard_Boolean MustExecute( const TFunction_Logbook& ) const;
-  virtual void Validate( TFunction_Logbook& ) const;
+  virtual Standard_Integer Execute( LOGBOOK& ) const; 
+  Standard_Boolean MustExecute( const LOGBOOK& ) const;
+  virtual void Validate( LOGBOOK& ) const;
 
   virtual bool GetCreationInformation( std::string&,
                                        std::vector<GEOM_Param>& );
 
-  DEFINE_STANDARD_RTTI( CANRECPluginImpl_Driver );
+OCCT_DEFINE_STANDARD_RTTIEXT( CANRECPluginImpl_Driver, GEOM_BaseDriver )
 };
 
 #endif // __CANRECPLUGINIMPL_DRIVER_HXX

diff --git a/src/CANRECPLUGINGUI/CMakeLists.txt b/src/CANRECPLUGINGUI/CMakeLists.txt
index d8a91243e015d2dc14a9cb83e0cf708795f7a867..fff522c7698d9bb01440334032abef5a26e0844f 100644 (file)
--- a/src/CANRECPLUGINGUI/CMakeLists.txt
+++ b/src/CANRECPLUGINGUI/CMakeLists.txt
@@ -17,8 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(UseQt4Ext)
-INCLUDE(${QT_USE_FILE})
+INCLUDE(UseQtExt)
 
 # --- options ---
 # additional include directories
@@ -43,13 +42,6 @@ ADD_DEFINITIONS(
 
 # libraries to link to
 SET(_link_LIBRARIES
-#  ${GUI_SalomeApp}
-#  ${GUI_qtx}
-#  ${GUI_suit}
-#  ${GUI_SalomeObject}
-#  ${GUI_LightApp}
-#  ${CAS_KERNEL}
-#  ${GEOM_GEOM}
   ${GEOM_GEOMBase}
   SalomeIDLCANRECPlugin
 )
@@ -71,7 +63,7 @@ SET(CANRECPluginGUI_HEADERS ${_moc_HEADERS} ${_other_HEADERS})
 # --- sources ---
 
 # sources / moc wrappings
-QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
 
 # sources / static
 SET(_other_SOURCES
@@ -100,4 +92,4 @@ INSTALL(TARGETS CANRECPluginGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${
 
 INSTALL(FILES ${CANRECPluginGUI_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
 
-QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_CANRECPLUGIN_INSTALL_RES_DATA}")
+QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_CANRECPLUGIN_INSTALL_RES_DATA}")