X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2FCMakeLists.txt;h=61eddab92624b71461d38670fe47ae8a9c6f3efb;hb=919584a7e5ee83c384873c2627b9865e8ba02272;hp=3e8e87e1989988a0b12daa4bcb5676f3a88b6ce8;hpb=42a0eadea64d278ba043680cfee74fa2f1c0f688;p=modules%2Fshaper.git

diff --git a/src/FeaturesPlugin/CMakeLists.txt b/src/FeaturesPlugin/CMakeLists.txt
index 3e8e87e19..61eddab92 100644
--- a/src/FeaturesPlugin/CMakeLists.txt
+++ b/src/FeaturesPlugin/CMakeLists.txt
@@ -7,6 +7,7 @@ SET(PROJECT_HEADERS
     FeaturesPlugin.h
     FeaturesPlugin_Plugin.h
     FeaturesPlugin_Extrusion.h
+    FeaturesPlugin_Recover.h
     FeaturesPlugin_Revolution.h
     FeaturesPlugin_Rotation.h
     FeaturesPlugin_Translation.h
@@ -24,14 +25,16 @@ SET(PROJECT_HEADERS
     FeaturesPlugin_RevolutionBoolean.h
     FeaturesPlugin_RevolutionCut.h
     FeaturesPlugin_RevolutionFuse.h
+    FeaturesPlugin_Union.h
     FeaturesPlugin_ValidatorTransform.h
     FeaturesPlugin_Validators.h
-    FeaturesPlugin_Wire.h
+    FeaturesPlugin_RemoveSubShapes.h
 )
 
 SET(PROJECT_SOURCES
     FeaturesPlugin_Plugin.cpp
     FeaturesPlugin_Extrusion.cpp
+    FeaturesPlugin_Recover.cpp
     FeaturesPlugin_Revolution.cpp
     FeaturesPlugin_Rotation.cpp
     FeaturesPlugin_Translation.cpp
@@ -49,9 +52,10 @@ SET(PROJECT_SOURCES
     FeaturesPlugin_RevolutionBoolean.cpp
     FeaturesPlugin_RevolutionCut.cpp
     FeaturesPlugin_RevolutionFuse.cpp
+    FeaturesPlugin_Union.cpp
     FeaturesPlugin_ValidatorTransform.cpp
     FeaturesPlugin_Validators.cpp
-    FeaturesPlugin_Wire.cpp
+    FeaturesPlugin_RemoveSubShapes.cpp
 )
 
 SET(XML_RESOURCES
@@ -66,13 +70,22 @@ SET(XML_RESOURCES
   translation_widget.xml
   boolean_widget.xml
   group_widget.xml
+  recover_widget.xml
   partition_widget.xml
   placement_widget.xml
   intersection_widget.xml
   pipe_widget.xml
-  wire_widget.xml
+  remove_subshapes_widget.xml
+  union_widget.xml
 )
 
+SET(TEXT_RESOURCES
+    FeaturesPlugin_msg_en.ts
+)
+
+SOURCE_GROUP ("Resource Files" FILES ${TEXT_RESOURCES})
+
+
 INCLUDE_DIRECTORIES(
   ../ModelAPI
   ../GeomAPI
@@ -89,64 +102,14 @@ SET(PROJECT_LIBRARIES
     GeomValidators
 )
 
-SET(ICON_RESOURCES
-  icons/angle.png
-  icons/angle_down.png
-  icons/angle_up.png
-  icons/angle_up_down.png
-  icons/angle_up_down_32x32.png
-  icons/axis.png
-  icons/bool_common.png
-  icons/bool_cut.png
-  icons/bool_fuse.png
-  icons/bool_smash.png
-  icons/common.png
-  icons/cut.png
-  icons/cut_shape.png
-  icons/cut_tool.png
-  icons/dimension_down.png
-  icons/dimension_down_32x32.png
-  icons/dimension_up.png
-  icons/dimension_up_32x32.png
-  icons/dimension_up_down.png
-  icons/dimension_up_down_32x32.png
-  icons/dimension_v.png
-  icons/dimension_v_32x32.png
-  icons/dimension_vert_32x32.png
-  icons/extrusion.png
-  icons/extrusion_cut.png
-  icons/extrusion_fuse.png
-  icons/extrusionsketch.png
-  icons/feature_wire.png
-  icons/fusion.png
-  icons/intersection.png
-  icons/movement.png
-  icons/partition.png
-  icons/pipe.png
-  icons/pipe_binormal_32x32.png
-  icons/pipe_locations_32x32.png
-  icons/pipe_simple_32x32.png
-  icons/placement.png
-  icons/placement_from.png
-  icons/placement_to.png
-  icons/plane.png
-  icons/plane_inverted.png
-  icons/plane_inverted_32x32.png
-  icons/revol_cut.png
-  icons/revol_fuse.png
-  icons/revolsketch.png
-  icons/rotation.png
-  icons/shape_group.png
-  icons/sketch.png
-)
-
 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 ${SHAPER_INSTALL_PLUGIN_FILES})
 INSTALL(FILES ${XML_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES})
-INSTALL(FILES ${ICON_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}/icons/Features)
+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
@@ -162,7 +125,12 @@ ADD_UNIT_TESTS(TestExtrusion.py
                TestBoolean.py
                TestBooleanCompSolids.py
                TestBooleanSmash.py
+               TestBooleanFill.py
                TestMultiBoolean.py
                TestSerialBoolean.py
                TestGroup.py
-               TestIntersection.py)
+               TestIntersection.py
+               TestUnion.py
+               TestRemoveSubShapes.py
+               TestPipe.py
+               TestRecover.py)