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

diff --git a/src/FeaturesPlugin/CMakeLists.txt b/src/FeaturesPlugin/CMakeLists.txt
index 3e8e87e19..a58b83a39 100644
--- a/src/FeaturesPlugin/CMakeLists.txt
+++ b/src/FeaturesPlugin/CMakeLists.txt
@@ -26,7 +26,6 @@ SET(PROJECT_HEADERS
     FeaturesPlugin_RevolutionFuse.h
     FeaturesPlugin_ValidatorTransform.h
     FeaturesPlugin_Validators.h
-    FeaturesPlugin_Wire.h
 )
 
 SET(PROJECT_SOURCES
@@ -51,7 +50,6 @@ SET(PROJECT_SOURCES
     FeaturesPlugin_RevolutionFuse.cpp
     FeaturesPlugin_ValidatorTransform.cpp
     FeaturesPlugin_Validators.cpp
-    FeaturesPlugin_Wire.cpp
 )
 
 SET(XML_RESOURCES
@@ -70,7 +68,6 @@ SET(XML_RESOURCES
   placement_widget.xml
   intersection_widget.xml
   pipe_widget.xml
-  wire_widget.xml
 )
 
 INCLUDE_DIRECTORIES(
@@ -89,64 +86,13 @@ 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})
 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)
 
 ADD_UNIT_TESTS(TestExtrusion.py
                TestExtrusionCut.py
@@ -165,4 +111,5 @@ ADD_UNIT_TESTS(TestExtrusion.py
                TestMultiBoolean.py
                TestSerialBoolean.py
                TestGroup.py
-               TestIntersection.py)
+               TestIntersection.py
+               TestPipe.py)