X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FFeaturesPlugin%2FCMakeLists.txt;h=47fea06c91e01b291ca8416a837cc55d7d0f0770;hb=aa56c224d53bb383b6489c67ccc5d9c60fe193ec;hp=9a39487a9e57984efb183bed5d997d5c22f9b7d9;hpb=dc7d4d86b58b81684abc9b5a2be8ec30f210c2da;p=modules%2Fshaper.git

diff --git a/src/FeaturesPlugin/CMakeLists.txt b/src/FeaturesPlugin/CMakeLists.txt
index 9a39487a9..47fea06c9 100644
--- a/src/FeaturesPlugin/CMakeLists.txt
+++ b/src/FeaturesPlugin/CMakeLists.txt
@@ -30,6 +30,11 @@ SET(PROJECT_HEADERS
     FeaturesPlugin_Rotation.h
     FeaturesPlugin_Translation.h
     FeaturesPlugin_Boolean.h
+    FeaturesPlugin_BooleanCut.h
+    FeaturesPlugin_BooleanFuse.h
+    FeaturesPlugin_BooleanCommon.h
+    FeaturesPlugin_BooleanSmash.h
+    FeaturesPlugin_BooleanFill.h
     FeaturesPlugin_Intersection.h
     FeaturesPlugin_Partition.h
     FeaturesPlugin_Pipe.h
@@ -52,6 +57,7 @@ SET(PROJECT_HEADERS
     FeaturesPlugin_MultiTranslation.h
     FeaturesPlugin_MultiRotation.h
     FeaturesPlugin_Fillet.h
+    FeaturesPlugin_Measurement.h
 )
 
 SET(PROJECT_SOURCES
@@ -62,6 +68,10 @@ SET(PROJECT_SOURCES
     FeaturesPlugin_Rotation.cpp
     FeaturesPlugin_Translation.cpp
     FeaturesPlugin_Boolean.cpp
+    FeaturesPlugin_BooleanCut.cpp
+    FeaturesPlugin_BooleanFuse.cpp
+    FeaturesPlugin_BooleanCommon.cpp
+    FeaturesPlugin_BooleanSmash.cpp
     FeaturesPlugin_Intersection.cpp
     FeaturesPlugin_Partition.cpp
     FeaturesPlugin_Pipe.cpp
@@ -84,6 +94,7 @@ SET(PROJECT_SOURCES
     FeaturesPlugin_MultiTranslation.cpp
     FeaturesPlugin_MultiRotation.cpp
     FeaturesPlugin_Fillet.cpp
+    FeaturesPlugin_Measurement.cpp
 )
 
 SET(XML_RESOURCES
@@ -97,6 +108,9 @@ SET(XML_RESOURCES
   rotation_widget.xml
   translation_widget.xml
   boolean_widget.xml
+  boolean_fuse_widget.xml
+  boolean_common_widget.xml
+  boolean_smash_widget.xml
   recover_widget.xml
   partition_widget.xml
   placement_widget.xml
@@ -109,6 +123,7 @@ SET(XML_RESOURCES
   multitranslation_widget.xml
   multirotation_widget.xml
   fillet_widget.xml
+  measurement_widget.xml
 )
 
 SET(TEXT_RESOURCES
@@ -125,6 +140,8 @@ INCLUDE_DIRECTORIES(
   ../GeomAlgoAPI
   ../GeomValidators
   ../Events
+  ../Config
+  ${CAS_INCLUDE_DIRS}
 )
 
 SET(PROJECT_LIBRARIES
@@ -133,6 +150,9 @@ SET(PROJECT_LIBRARIES
     GeomAPI
     GeomAlgoAPI
     GeomValidators
+    Config
+    ${CAS_VIEWER}
+    ${CAS_SHAPE}
 )
 
 ADD_DEFINITIONS(-DFEATURESPLUGIN_EXPORTS)
@@ -218,6 +238,12 @@ ADD_UNIT_TESTS(TestExtrusion.py
                TestPartitionWireFaceSolid.py
                TestUnion4CurvedFaces.py
                TestUnion4Faces.py
+               TestUnionOfUnion.py
+               TestMeasurementLength.py
+               TestMeasurementDistance.py
+               TestMeasurementRadius.py
+               TestMeasurementAngle.py
+               Test1379.py
                Test1922.py
                Test1942.py
                Test1915.py
@@ -241,5 +267,63 @@ ADD_UNIT_TESTS(TestExtrusion.py
                Test2255.py
                Test2289.py
                Test2304.py
+               Test2304_2.py
+               Test2375.py
                Test2377.py
+               Test2394.py
+               Test2395.py
+               Test2419_1.py
+               Test2419_2.py
+               Test2419_3.py
+               Test2465.py
+               Test2495.py
+               Test2514.py
+               Test2520.py
+               TestBooleanCut_CompSolid_CompSolid.py
+               TestBooleanCut_CompSolidCompound_CompSolidCompound.py
+               TestBooleanCut_Edge_Edge.py
+               TestBooleanCut_Edge_Face.py
+               TestBooleanCut_EdgeCompound_EdgeCompound.py
+               TestBooleanCut_EdgeCompound_Solid.py
+               TestBooleanCut_Face_Face.py
+               TestBooleanCut_Face_Solid.py
+               TestBooleanCut_FaceCompound_FaceCompound.py
+               TestBooleanCut_Shell_Shell.py
+               TestBooleanCut_ShellCompound_ShellCompound.py
+               TestBooleanCut_Solid_Solid.py
+               TestBooleanCut_SolidCompound_SolidCompound.py
+               TestBooleanCut_Vertex_Vertex.py
+               TestBooleanCut_VertexCompound_Solid.py
+               TestBooleanCut_VertexCompound_VertexCompound.py
+               TestBooleanCut_Wire_Face.py
+               TestBooleanCut_Wire_Wire.py
+               TestBooleanCut_WireCompound_WireCompound.py
+               TestBooleanSmash_Face_Face.py
+               TestBooleanFuse_SimpleMode.py
+               TestBooleanFuse_RemoveEdges.py
+               TestBooleanCommon_Vertex_Vertex.py
+               TestBooleanCommon_VertexCompound_VertexCompound.py
+               TestBooleanCommon_Edge_Edge.py
+               TestBooleanCommon_EdgeCompound_EdgeCompound.py
+               TestBooleanCommon_Wire_Wire.py
+               TestBooleanCommon_WireCompound_WireCompound.py
+               TestBooleanCommon_Face_Face.py
+               TestBooleanCommon_FaceCompound_FaceCompound.py
+               TestBooleanCommon_Shell_Shell.py
+               TestBooleanCommon_ShellCompound_ShellCompound.py
+               TestBooleanCommon_Solid_Face.py
+               TestBooleanCommon_Solid_Shell.py
+               TestBooleanCommon_Solid_Solid.py
+               TestBooleanCommon_SolidCompound_Face.py
+               TestBooleanCommon_SolidCompound_Shell.py
+               TestBooleanCommon_SolidCompound_SolidCompound.py
+               TestBooleanCommon_CompSolid_Face.py
+               TestBooleanCommon_CompSolid_Shell.py
+               TestBooleanCommon_CompSolid_CompSolid.py
+               TestBooleanCommon_CompSolidCompound_Face.py
+               TestBooleanCommon_CompSolidCompound_Shell.py
+               TestBooleanCommon_CompSolidCompound_CompSolidCompound.py
+               Test2596.py
+               Test2592.py
+               Test2588.py
 )