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

diff --git a/src/FeaturesPlugin/CMakeLists.txt b/src/FeaturesPlugin/CMakeLists.txt
index a58b83a39..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,13 +25,16 @@ SET(PROJECT_HEADERS
     FeaturesPlugin_RevolutionBoolean.h
     FeaturesPlugin_RevolutionCut.h
     FeaturesPlugin_RevolutionFuse.h
+    FeaturesPlugin_Union.h
     FeaturesPlugin_ValidatorTransform.h
     FeaturesPlugin_Validators.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
@@ -48,8 +52,10 @@ SET(PROJECT_SOURCES
     FeaturesPlugin_RevolutionBoolean.cpp
     FeaturesPlugin_RevolutionCut.cpp
     FeaturesPlugin_RevolutionFuse.cpp
+    FeaturesPlugin_Union.cpp
     FeaturesPlugin_ValidatorTransform.cpp
     FeaturesPlugin_Validators.cpp
+    FeaturesPlugin_RemoveSubShapes.cpp
 )
 
 SET(XML_RESOURCES
@@ -64,12 +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
+  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
@@ -87,12 +103,13 @@ SET(PROJECT_LIBRARIES
 )
 
 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(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
@@ -108,8 +125,12 @@ ADD_UNIT_TESTS(TestExtrusion.py
                TestBoolean.py
                TestBooleanCompSolids.py
                TestBooleanSmash.py
+               TestBooleanFill.py
                TestMultiBoolean.py
                TestSerialBoolean.py
                TestGroup.py
                TestIntersection.py
-               TestPipe.py)
+               TestUnion.py
+               TestRemoveSubShapes.py
+               TestPipe.py
+               TestRecover.py)