X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2FCMakeLists.txt;h=89429c4d122e8df4775985a030d23096db84c23f;hb=8f2e8789faa06405e900ee2272858a8ca898ba32;hp=c475ee87d0a974f5193602e05df148d154be4756;hpb=39318e10d9345c5b596d16c89469ee5e68ee734a;p=modules%2Fshaper.git

diff --git a/src/FeaturesPlugin/CMakeLists.txt b/src/FeaturesPlugin/CMakeLists.txt
index c475ee87d..89429c4d1 100644
--- a/src/FeaturesPlugin/CMakeLists.txt
+++ b/src/FeaturesPlugin/CMakeLists.txt
@@ -9,18 +9,23 @@ SET(PROJECT_HEADERS
     FeaturesPlugin_Extrusion.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_ValidatorTransform.h
+    FeaturesPlugin_Validators.h
 )
 
 SET(PROJECT_SOURCES
@@ -28,18 +33,23 @@ SET(PROJECT_SOURCES
     FeaturesPlugin_Extrusion.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_ValidatorTransform.cpp
+    FeaturesPlugin_Validators.cpp
 )
 
 SET(XML_RESOURCES
@@ -51,33 +61,38 @@ SET(XML_RESOURCES
   revolutioncut_widget.xml
   revolutionfuse_widget.xml
   rotation_widget.xml
-  movement_widget.xml
+  translation_widget.xml
   boolean_widget.xml
   group_widget.xml
   partition_widget.xml
   placement_widget.xml
+  intersection_widget.xml
+  pipe_widget.xml
 )
 
 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})
 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)
 
 ADD_UNIT_TESTS(TestExtrusion.py
                TestExtrusionCut.py
@@ -85,10 +100,15 @@ ADD_UNIT_TESTS(TestExtrusion.py
                TestRevolution.py
                TestRevolutionCut.py
                TestRevolutionFuse.py
+               TestCompositeFeaturesOnCompSolids.py
                TestPartition.py
-               TestMovement.py
+               TestPlacement.py
+               TestTranslation.py
                TestRotation.py
                TestBoolean.py
+               TestBooleanCompSolids.py
+               TestBooleanSmash.py
                TestMultiBoolean.py
                TestSerialBoolean.py
-               TestGroup.py)
+               TestGroup.py
+               TestIntersection.py)