X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2FCMakeLists.txt;h=a58b83a3930d37bd0a5ae03ad41c1f246dedf9a5;hb=658fccce59f75b0cfa7c3f3d45f1ffb295ed24be;hp=8a1001b85a5c495e3fcb0d81cf353471b0b35bd4;hpb=5315361b0c34c6e603474413024db5485c850d80;p=modules%2Fshaper.git

diff --git a/src/FeaturesPlugin/CMakeLists.txt b/src/FeaturesPlugin/CMakeLists.txt
index 8a1001b85..a58b83a39 100644
--- a/src/FeaturesPlugin/CMakeLists.txt
+++ b/src/FeaturesPlugin/CMakeLists.txt
@@ -19,10 +19,8 @@ SET(PROJECT_HEADERS
     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
@@ -44,11 +42,9 @@ SET(PROJECT_SOURCES
     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
@@ -59,11 +55,9 @@ SET(PROJECT_SOURCES
 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
@@ -80,6 +74,7 @@ INCLUDE_DIRECTORIES(
   ../ModelAPI
   ../GeomAPI
   ../GeomAlgoAPI
+  ../GeomValidators
   ../Events
 )
 
@@ -88,6 +83,7 @@ SET(PROJECT_LIBRARIES
     ModelAPI
     GeomAPI
     GeomAlgoAPI
+    GeomValidators
 )
 
 ADD_DEFINITIONS(-DFEATURESPLUGIN_EXPORTS)
@@ -96,13 +92,12 @@ 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)
 
 ADD_UNIT_TESTS(TestExtrusion.py
-               TestExtrusionSketch.py
                TestExtrusionCut.py
                TestExtrusionFuse.py
                TestRevolution.py
-               TestRevolutionSketch.py
                TestRevolutionCut.py
                TestRevolutionFuse.py
                TestCompositeFeaturesOnCompSolids.py
@@ -116,4 +111,5 @@ ADD_UNIT_TESTS(TestExtrusion.py
                TestMultiBoolean.py
                TestSerialBoolean.py
                TestGroup.py
-               TestIntersection.py)
+               TestIntersection.py
+               TestPipe.py)