Make extrusions features correctly eat as a base a whole sketch feature selection.

[modules/shaper.git] / src / FeaturesPlugin / CMakeLists.txt

diff --git a/src/FeaturesPlugin/CMakeLists.txt b/src/FeaturesPlugin/CMakeLists.txt
index 3a60a545c1fb97c8aea674a87b643d3cf16a8ee8..a49cd84fda1973fa75300574a8b86d3371fb2433 100644 (file)
--- a/src/FeaturesPlugin/CMakeLists.txt
+++ b/src/FeaturesPlugin/CMakeLists.txt
@@ -58,7 +58,6 @@ SET(PROJECT_HEADERS
     FeaturesPlugin_MultiRotation.h
     FeaturesPlugin_Fillet.h
     FeaturesPlugin_Measurement.h
-    FeaturesPlugin_FusionFaces.h
 )
 
 SET(PROJECT_SOURCES
@@ -70,6 +69,7 @@ SET(PROJECT_SOURCES
     FeaturesPlugin_Translation.cpp
     FeaturesPlugin_Boolean.cpp
     FeaturesPlugin_BooleanCut.cpp
+    FeaturesPlugin_BooleanFuse.cpp
     FeaturesPlugin_BooleanSmash.cpp
     FeaturesPlugin_Intersection.cpp
     FeaturesPlugin_Partition.cpp
@@ -94,7 +94,6 @@ SET(PROJECT_SOURCES
     FeaturesPlugin_MultiRotation.cpp
     FeaturesPlugin_Fillet.cpp
     FeaturesPlugin_Measurement.cpp
-    FeaturesPlugin_FusionFaces.cpp
 )
 
 SET(XML_RESOURCES
@@ -108,6 +107,7 @@ SET(XML_RESOURCES
   rotation_widget.xml
   translation_widget.xml
   boolean_widget.xml
+  boolean_fuse_widget.xml
   boolean_smash_widget.xml
   recover_widget.xml
   partition_widget.xml
@@ -122,7 +122,6 @@ SET(XML_RESOURCES
   multirotation_widget.xml
   fillet_widget.xml
   measurement_widget.xml
-  fusion_faces_widget.xml
 )
 
 SET(TEXT_RESOURCES
@@ -242,7 +241,6 @@ ADD_UNIT_TESTS(TestExtrusion.py
                TestMeasurementDistance.py
                TestMeasurementRadius.py
                TestMeasurementAngle.py
-               TestFusionFaces.py
                Test1379.py
                Test1922.py
                Test1942.py
@@ -299,4 +297,6 @@ ADD_UNIT_TESTS(TestExtrusion.py
                TestBooleanCut_Wire_Wire.py
                TestBooleanCut_WireCompound_WireCompound.py
                TestBooleanSmash_Face_Face.py
+               TestBooleanFuse_SimpleMode.py
+               TestBooleanFuse_RemoveEdges.py
 )