Merge branch 'V9_5_BR'

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

diff --git a/src/FeaturesPlugin/CMakeLists.txt b/src/FeaturesPlugin/CMakeLists.txt
index e472d6fc1e3904be345c51b6504e9a18616878cc..0169cd9e3bea23cb95db9b87af56cfd3eb622f88 100644 (file)
--- a/src/FeaturesPlugin/CMakeLists.txt
+++ b/src/FeaturesPlugin/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2019  CEA/DEN, EDF R&D
+# Copyright (C) 2014-2020  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -57,6 +57,7 @@ SET(PROJECT_HEADERS
     FeaturesPlugin_MultiTranslation.h
     FeaturesPlugin_MultiRotation.h
     FeaturesPlugin_Fillet.h
+    FeaturesPlugin_Fillet1D.h
     FeaturesPlugin_Measurement.h
     FeaturesPlugin_FusionFaces.h
     FeaturesPlugin_RemoveResults.h
@@ -103,6 +104,7 @@ SET(PROJECT_SOURCES
     FeaturesPlugin_MultiTranslation.cpp
     FeaturesPlugin_MultiRotation.cpp
     FeaturesPlugin_Fillet.cpp
+    FeaturesPlugin_Fillet1D.cpp
     FeaturesPlugin_Measurement.cpp
     FeaturesPlugin_FusionFaces.cpp
     FeaturesPlugin_RemoveResults.cpp
@@ -140,6 +142,7 @@ SET(XML_RESOURCES
   multitranslation_widget.xml
   multirotation_widget.xml
   fillet_widget.xml
+  fillet1d_widget.xml
   measurement_widget.xml
   fusion_faces_widget.xml
   chamfer_widget.xml
@@ -154,6 +157,7 @@ SET(TEXT_RESOURCES
     FeaturesPlugin_msg_ru.ts
 )
 
+SOURCE_GROUP ("XML Files" FILES ${XML_RESOURCES})
 SOURCE_GROUP ("Resource Files" FILES ${TEXT_RESOURCES})
 
 
@@ -552,6 +556,7 @@ ADD_UNIT_TESTS(TestExtrusion.py
                Test3033.py
                Test3076.py
                Test17909.py
+               TestCopy_ErrorMsg.py
                TestCopyFeature.py
                TestCopyFeatureMoveGroupOfFeature.py
                TestCopyMoveResult.py
@@ -570,6 +575,7 @@ ADD_UNIT_TESTS(TestExtrusion.py
                TestDefeaturing_OnCompound.py
                Test3137_1.py
                Test3137_2.py
+               Test2918.py
                Test3139.py
                TestPlacement_MultiLevelCompound_v0_1.py
                TestPlacement_MultiLevelCompound_v0_2.py
@@ -655,4 +661,25 @@ ADD_UNIT_TESTS(TestExtrusion.py
                TestChamfer_MultiLevelCompound_v95_2.py
                TestChamfer_MultiLevelCompound_v95_3.py
                TestChamfer_MultiLevelCompound_v95_4.py
+               Test18836.py
+               Test2817.py
+               Test19065.py
+               Test19066.py
+               Test19115.py
+               Test19196.py
+               TestFillet1D_ErrorMsg.py
+               TestFillet1D_Vertices_1.py
+               TestFillet1D_Vertices_2.py
+               TestFillet1D_Vertices_3.py
+               TestFillet1D_Vertices_4.py
+               TestFillet1D_Vertices_5.py
+               TestFillet1D_Vertices_6.py
+               TestFillet1D_Vertices_7.py
+               TestFillet1D_Vertices_8.py
+               TestFillet1D_Vertices_9.py
+               TestFillet1D_Wire_1.py
+               TestFillet1D_Wire_2.py
+               TestFillet1D_Wire_3.py
+               TestFillet1D_Wire_4.py
+               TestFillet1D_Wire_5.py
 )