Porting to SALOME_8.2.0

diff --git a/src/CollectionPlugin/CMakeLists.txt b/src/CollectionPlugin/CMakeLists.txt
index 16e2b216639f0623e89d6693c5c29ecbe6407c17..653aeb8e6623f0e7de8f95b0756957cc13806d42 100644 (file)
--- a/src/CollectionPlugin/CMakeLists.txt
+++ b/src/CollectionPlugin/CMakeLists.txt
@@ -2,22 +2,29 @@
 
 INCLUDE(Common)
 INCLUDE(UnitTest)
+INCLUDE(UseQtExt)
+
+# additional include directories
+INCLUDE_DIRECTORIES(${QT_INCLUDES})
+
+# additional preprocessor / compiler flags
+ADD_DEFINITIONS(${QT_DEFINITIONS})
 
 SET(PROJECT_HEADERS
     CollectionPlugin.h
     CollectionPlugin_Plugin.h
     CollectionPlugin_Group.h
     CollectionPlugin_Field.h
-       CollectionPlugin_WidgetCreator.h
-       CollectionPlugin_WidgetField.h
+    CollectionPlugin_WidgetCreator.h
+    CollectionPlugin_WidgetField.h
 )
 
 SET(PROJECT_SOURCES
     CollectionPlugin_Plugin.cpp
     CollectionPlugin_Group.cpp
     CollectionPlugin_Field.cpp
-       CollectionPlugin_WidgetCreator.cpp
-       CollectionPlugin_WidgetField.cpp
+    CollectionPlugin_WidgetCreator.cpp
+    CollectionPlugin_WidgetField.cpp
 )
 
 SET(XML_RESOURCES
@@ -29,6 +36,12 @@ SET(TEXT_RESOURCES
     CollectionPlugin_msg_en.ts
 )
 
+# sources / moc wrappings
+QT_WRAP_MOC(PROJECT_AUTOMOC ${PROJECT_HEADERS})
+
+#QT5_ADD_TRANSLATION(QM_RESOURCES ${TEXT_RESOURCES})
+
+SOURCE_GROUP ("Generated Files" FILES ${PROJECT_AUTOMOC} ${PROJECT_COMPILED_RESOURCES} ${QM_RESOURCES})
 SOURCE_GROUP ("Resource Files" FILES ${TEXT_RESOURCES})
 
 
@@ -52,10 +65,16 @@ SET(PROJECT_LIBRARIES
     GeomValidators
     ModuleBase
     XGUI
+    ${QT_LIBRARIES}
 )
 
 ADD_DEFINITIONS(-DCOLLECTIONPLUGIN_EXPORTS ${CAS_DEFINITIONS})
-ADD_LIBRARY(CollectionPlugin MODULE ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${XML_RESOURCES} ${TEXT_RESOURCES})
+ADD_LIBRARY(CollectionPlugin MODULE
+            ${PROJECT_SOURCES}
+            ${PROJECT_HEADERS}
+            ${XML_RESOURCES}
+            ${TEXT_RESOURCES}
+            ${PROJECT_AUTOMOC})
 TARGET_LINK_LIBRARIES(CollectionPlugin ${PROJECT_LIBRARIES})
 
 INSTALL(TARGETS CollectionPlugin DESTINATION ${SHAPER_INSTALL_PLUGIN_FILES})

diff --git a/src/ModuleBase/CMakeLists.txt b/src/ModuleBase/CMakeLists.txt
index f45095636da25d13bab2eb849c585c07b99bcb25..8118d8d5176e834b8270b893ab257fd75b969ca9 100644 (file)
--- a/src/ModuleBase/CMakeLists.txt
+++ b/src/ModuleBase/CMakeLists.txt
@@ -142,7 +142,6 @@ SET(PROJECT_SOURCES
 )
 
 SET(PROJECT_LIBRARIES
-       ${QT_LIBRARIES}
        Config
        Events
        ModelAPI

diff --git a/src/PartSet/PartSet_ResultSketchPrs.cpp b/src/PartSet/PartSet_ResultSketchPrs.cpp
index 6a96a15d47152ca9ae7938ef3b4b90d4b87f879d..029c21bb68b6d8477c24b4b899d7ee386c7c7ca7 100755 (executable)
--- a/src/PartSet/PartSet_ResultSketchPrs.cpp
+++ b/src/PartSet/PartSet_ResultSketchPrs.cpp
@@ -229,11 +229,12 @@ void PartSet_ResultSketchPrs::setAuxiliaryPresentationStyle(const bool isAuxilia
   Quantity_Color aCurrentColor;
   Aspect_TypeOfLine aPrevLineType;
   Standard_Real aCurrentWidth;
-  aLineAspect->Aspect()->Values(aCurrentColor, aPrevLineType, aCurrentWidth);
+  // PORTING_TO_SALOME_8
+  /*aLineAspect->Aspect()->Values(aCurrentColor, aPrevLineType, aCurrentWidth);
   bool isChangedLineType = aType != aPrevLineType;
   if (isChangedLineType) {
     aLineAspect->SetTypeOfLine(aType);
-  }
+  }*/
 }
 
 void PartSet_ResultSketchPrs::fillShapes(TopoDS_Shape& theResultShape,

diff --git a/src/SamplePanelPlugin/CMakeLists.txt b/src/SamplePanelPlugin/CMakeLists.txt
index 2cf83e159c6996aac5036783e93652d09403a233..4c9c5eaa87c507da296d93c5dfa3b8ae66c2f260 100755 (executable)
--- a/src/SamplePanelPlugin/CMakeLists.txt
+++ b/src/SamplePanelPlugin/CMakeLists.txt
@@ -42,6 +42,8 @@ SET(XML_RESOURCES
 # sources / moc wrappings
 QT_WRAP_MOC(PROJECT_AUTOMOC ${PROJECT_HEADERS})
 
+SOURCE_GROUP ("Generated Files" FILES ${PROJECT_AUTOMOC})
+
 ADD_DEFINITIONS(-DSAMPLEPANELPLUGIN_EXPORTS -DWNT)
 ADD_LIBRARY(SamplePanelPlugin MODULE
             ${PROJECT_SOURCES}