X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FFeaturesPlugin%2FCMakeLists.txt;h=193d513e48894da26395251d2d5a4cec5e475e75;hb=21a0c85b52bb93f94680e2342370764e6510e387;hp=1fa7948da49c58c12a79e10e47df1c28cad9713b;hpb=9cce20c7c60a1f7807f452cf8858fdfcdfc3255f;p=modules%2Fshaper.git

diff --git a/src/FeaturesPlugin/CMakeLists.txt b/src/FeaturesPlugin/CMakeLists.txt
index 1fa7948da..193d513e4 100644
--- a/src/FeaturesPlugin/CMakeLists.txt
+++ b/src/FeaturesPlugin/CMakeLists.txt
@@ -7,39 +7,61 @@ SET(PROJECT_HEADERS
     FeaturesPlugin.h
     FeaturesPlugin_Plugin.h
     FeaturesPlugin_Extrusion.h
+    FeaturesPlugin_Recover.h
     FeaturesPlugin_Revolution.h
     FeaturesPlugin_Rotation.h
-    FeaturesPlugin_Movement.h
+    FeaturesPlugin_Translation.h
     FeaturesPlugin_Boolean.h
-    FeaturesPlugin_Group.h
+    FeaturesPlugin_Intersection.h
     FeaturesPlugin_Partition.h
+    FeaturesPlugin_Pipe.h
     FeaturesPlugin_Placement.h
     FeaturesPlugin_CompositeBoolean.h
+    FeaturesPlugin_CompositeSketch.h
     FeaturesPlugin_ExtrusionBoolean.h
     FeaturesPlugin_ExtrusionCut.h
     FeaturesPlugin_ExtrusionFuse.h
     FeaturesPlugin_RevolutionBoolean.h
     FeaturesPlugin_RevolutionCut.h
     FeaturesPlugin_RevolutionFuse.h
+    FeaturesPlugin_Union.h
+    FeaturesPlugin_ValidatorTransform.h
+    FeaturesPlugin_Validators.h
+    FeaturesPlugin_RemoveSubShapes.h
+    FeaturesPlugin_Tools.h
+    FeaturesPlugin_Symmetry.h
+    FeaturesPlugin_Scale.h
+    FeaturesPlugin_MultiTranslation.h
 )
 
 SET(PROJECT_SOURCES
     FeaturesPlugin_Plugin.cpp
     FeaturesPlugin_Extrusion.cpp
+    FeaturesPlugin_Recover.cpp
     FeaturesPlugin_Revolution.cpp
     FeaturesPlugin_Rotation.cpp
-    FeaturesPlugin_Movement.cpp
+    FeaturesPlugin_Translation.cpp
     FeaturesPlugin_Boolean.cpp
-    FeaturesPlugin_Group.cpp
+    FeaturesPlugin_Intersection.cpp
     FeaturesPlugin_Partition.cpp
+    FeaturesPlugin_Pipe.cpp
     FeaturesPlugin_Placement.cpp
     FeaturesPlugin_CompositeBoolean.cpp
+    FeaturesPlugin_CompositeSketch.cpp
     FeaturesPlugin_ExtrusionBoolean.cpp
     FeaturesPlugin_ExtrusionCut.cpp
     FeaturesPlugin_ExtrusionFuse.cpp
     FeaturesPlugin_RevolutionBoolean.cpp
     FeaturesPlugin_RevolutionCut.cpp
     FeaturesPlugin_RevolutionFuse.cpp
+    FeaturesPlugin_Union.cpp
+    FeaturesPlugin_ValidatorTransform.cpp
+    FeaturesPlugin_Validators.cpp
+    FeaturesPlugin_RemoveSubShapes.cpp
+    FeaturesPlugin_Tools.cpp
+    FeaturesPlugin_Symmetry.cpp
+    FeaturesPlugin_Scale.cpp
+    FeaturesPlugin_MultiTranslation.cpp
 )
 
 SET(XML_RESOURCES
@@ -51,33 +73,52 @@ SET(XML_RESOURCES
   revolutioncut_widget.xml
   revolutionfuse_widget.xml
   rotation_widget.xml
-  movement_widget.xml
+  translation_widget.xml
   boolean_widget.xml
-  group_widget.xml
+  recover_widget.xml
   partition_widget.xml
   placement_widget.xml
+  intersection_widget.xml
+  pipe_widget.xml
+  remove_subshapes_widget.xml
+  union_widget.xml
+  symmetry_widget.xml
+  scale_widget.xml
+  multitranslation_widget.xml
 )
 
+SET(TEXT_RESOURCES
+    FeaturesPlugin_msg_en.ts
+    FeaturesPlugin_msg_ru.ts
+)
+
+SOURCE_GROUP ("Resource Files" FILES ${TEXT_RESOURCES})
+
+
 INCLUDE_DIRECTORIES(
   ../ModelAPI
   ../GeomAPI
   ../GeomAlgoAPI
+  ../GeomValidators
   ../Events
 )
 
 SET(PROJECT_LIBRARIES
     Events
-    ModelAPI 
-    GeomAPI 
+    ModelAPI
+    GeomAPI
     GeomAlgoAPI
+    GeomValidators
 )
 
 ADD_DEFINITIONS(-DFEATURESPLUGIN_EXPORTS)
-ADD_LIBRARY(FeaturesPlugin MODULE ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${XML_RESOURCES})
+ADD_LIBRARY(FeaturesPlugin MODULE ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${XML_RESOURCES} ${TEXT_RESOURCES})
 TARGET_LINK_LIBRARIES(FeaturesPlugin ${PROJECT_LIBRARIES})
 
-INSTALL(TARGETS FeaturesPlugin DESTINATION plugins)
-INSTALL(FILES ${XML_RESOURCES} DESTINATION plugins)
+INSTALL(TARGETS FeaturesPlugin DESTINATION ${SHAPER_INSTALL_PLUGIN_FILES})
+INSTALL(FILES ${XML_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES})
+INSTALL(DIRECTORY icons/ DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}/icons/Features)
+INSTALL(FILES ${TEXT_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES})
 
 ADD_UNIT_TESTS(TestExtrusion.py
                TestExtrusionCut.py
@@ -85,9 +126,27 @@ ADD_UNIT_TESTS(TestExtrusion.py
                TestRevolution.py
                TestRevolutionCut.py
                TestRevolutionFuse.py
-               TestMovement.py
+               TestCompositeFeaturesOnCompSolids.py
+               TestPartition.py
+               TestPlacement.py
+               TestTranslation.py
                TestRotation.py
                TestBoolean.py
+               TestBooleanCompSolids.py
+               TestBooleanSmash.py
+               TestBooleanFill.py
                TestMultiBoolean.py
                TestSerialBoolean.py
-               TestGroup.py)
+               TestIntersection.py
+               TestUnion.py
+               TestRemoveSubShapes.py
+               TestPipe.py
+               TestRecover.py
+               TestRecover1798.py
+               Test1922.py
+               Test1942.py
+               Test1915.py
+               Test2023.py
+               Test2046.py
+               Test2038.py
+)