X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2FCMakeLists.txt;h=8dea5b736abaaa879b8d6bbe78974a0e2764fe50;hb=676ee79de539b14b242a561857c1505cce13d951;hp=1fa7948da49c58c12a79e10e47df1c28cad9713b;hpb=9cce20c7c60a1f7807f452cf8858fdfcdfc3255f;p=modules%2Fshaper.git

diff --git a/src/FeaturesPlugin/CMakeLists.txt b/src/FeaturesPlugin/CMakeLists.txt
index 1fa7948da..8dea5b736 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_Placement.h
     FeaturesPlugin_CompositeBoolean.h
+    FeaturesPlugin_CompositeSketch.h
     FeaturesPlugin_ExtrusionBoolean.h
+    FeaturesPlugin_ExtrusionSketch.h
     FeaturesPlugin_ExtrusionCut.h
     FeaturesPlugin_ExtrusionFuse.h
+    FeaturesPlugin_RevolutionSketch.h
     FeaturesPlugin_RevolutionBoolean.h
     FeaturesPlugin_RevolutionCut.h
     FeaturesPlugin_RevolutionFuse.h
+    FeaturesPlugin_ValidatorTransform.h
 )
 
 SET(PROJECT_SOURCES
@@ -28,34 +33,42 @@ 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_Placement.cpp
     FeaturesPlugin_CompositeBoolean.cpp
+    FeaturesPlugin_CompositeSketch.cpp
+    FeaturesPlugin_ExtrusionSketch.cpp
     FeaturesPlugin_ExtrusionBoolean.cpp
     FeaturesPlugin_ExtrusionCut.cpp
     FeaturesPlugin_ExtrusionFuse.cpp
+    FeaturesPlugin_RevolutionSketch.cpp
     FeaturesPlugin_RevolutionBoolean.cpp
     FeaturesPlugin_RevolutionCut.cpp
     FeaturesPlugin_RevolutionFuse.cpp
+    FeaturesPlugin_ValidatorTransform.cpp
 )
 
 SET(XML_RESOURCES
   plugin-Features.xml
   extrusion_widget.xml
+  extrusionsketch_widget.xml
   extrusioncut_widget.xml
   extrusionfuse_widget.xml
   revolution_widget.xml
+  revolutionsketch_widget.xml
   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
 )
 
 INCLUDE_DIRECTORIES(
@@ -67,8 +80,8 @@ INCLUDE_DIRECTORIES(
 
 SET(PROJECT_LIBRARIES
     Events
-    ModelAPI 
-    GeomAPI 
+    ModelAPI
+    GeomAPI
     GeomAlgoAPI
 )
 
@@ -76,18 +89,25 @@ 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})
 
 ADD_UNIT_TESTS(TestExtrusion.py
+               TestExtrusionSketch.py
                TestExtrusionCut.py
                TestExtrusionFuse.py
                TestRevolution.py
+               TestRevolutionSketch.py
                TestRevolutionCut.py
                TestRevolutionFuse.py
-               TestMovement.py
+               TestCompositeFeaturesOnCompSolids.py
+               TestPartition.py
+               TestPlacement.py
+               TestTranslation.py
                TestRotation.py
                TestBoolean.py
+               TestBooleanCompSolids.py
                TestMultiBoolean.py
                TestSerialBoolean.py
-               TestGroup.py)
+               TestGroup.py
+               TestIntersection.py)