X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchPlugin%2FCMakeLists.txt;h=e7ec8b7c75dd03891b82e56f0ad4bde4e7c85cba;hb=803c5fda09029cf64d9a21daac18d08cd19e6585;hp=c2d0224e2f59c547d88488ab8e5fb789c65eebd1;hpb=586e0f3d89e48652e2ec3587f5e5584e13109b4a;p=modules%2Fshaper.git

diff --git a/src/SketchPlugin/CMakeLists.txt b/src/SketchPlugin/CMakeLists.txt
index c2d0224e2..e7ec8b7c7 100644
--- a/src/SketchPlugin/CMakeLists.txt
+++ b/src/SketchPlugin/CMakeLists.txt
@@ -1,79 +1,116 @@
-## Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+## Copyright (C) 2014-2017  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
+## License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+##
+## This library is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public
+## License along with this library; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+## See http:##www.salome-platform.org/ or
+## email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+##
 
 INCLUDE(Common)
 INCLUDE(UnitTest)
 
 SET(PROJECT_HEADERS
     SketchPlugin.h
-    SketchPlugin_Feature.h
-    SketchPlugin_Plugin.h
-    SketchPlugin_Sketch.h
-    SketchPlugin_SketchEntity.h
-    SketchPlugin_Line.h
-    SketchPlugin_Point.h
-    SketchPlugin_IntersectionPoint.h
-    SketchPlugin_Circle.h
     SketchPlugin_Arc.h
+    SketchPlugin_Circle.h
     SketchPlugin_Constraint.h
+    SketchPlugin_ConstraintAngle.h
     SketchPlugin_ConstraintBase.h
     SketchPlugin_ConstraintCoincidence.h
     SketchPlugin_ConstraintCollinear.h
     SketchPlugin_ConstraintDistance.h
+    SketchPlugin_ConstraintDistanceAlongDir.h
+    SketchPlugin_ConstraintDistanceHorizontal.h
+    SketchPlugin_ConstraintDistanceVertical.h
+    SketchPlugin_ConstraintEqual.h
+    SketchPlugin_Fillet.h
+    SketchPlugin_ConstraintHorizontal.h
     SketchPlugin_ConstraintLength.h
     SketchPlugin_ConstraintMiddle.h
+    SketchPlugin_ConstraintMirror.h
     SketchPlugin_ConstraintParallel.h
     SketchPlugin_ConstraintPerpendicular.h
     SketchPlugin_ConstraintRadius.h
     SketchPlugin_ConstraintRigid.h
-    SketchPlugin_ConstraintHorizontal.h
-    SketchPlugin_ConstraintVertical.h
-    SketchPlugin_ConstraintEqual.h
     SketchPlugin_ConstraintTangent.h
-    SketchPlugin_ConstraintMirror.h
-    SketchPlugin_ConstraintFillet.h
-    SketchPlugin_ConstraintAngle.h
+    SketchPlugin_ConstraintVertical.h
+    SketchPlugin_Ellipse.h
+    SketchPlugin_ExternalValidator.h
+    SketchPlugin_Feature.h
+    SketchPlugin_IntersectionPoint.h
+    SketchPlugin_Line.h
+    SketchPlugin_MacroArc.h
+    SketchPlugin_MacroArcReentrantMessage.h
+    SketchPlugin_MacroCircle.h
+    SketchPlugin_MacroEllipse.h
     SketchPlugin_MultiRotation.h
     SketchPlugin_MultiTranslation.h
-    SketchPlugin_ExternalValidator.h
-    SketchPlugin_Validators.h
-    SketchPlugin_Tools.h
+    SketchPlugin_Plugin.h
+    SketchPlugin_Point.h
     SketchPlugin_Projection.h
+    SketchPlugin_Sketch.h
+    SketchPlugin_SketchEntity.h
+    SketchPlugin_Split.h
+    SketchPlugin_Tools.h
+    SketchPlugin_Trim.h
+    SketchPlugin_Validators.h
 )
 
 SET(PROJECT_SOURCES
-    SketchPlugin_Feature.cpp
-    SketchPlugin_Plugin.cpp
-    SketchPlugin_Sketch.cpp
-    SketchPlugin_SketchEntity.cpp
-    SketchPlugin_Line.cpp
-    SketchPlugin_Point.cpp
-    SketchPlugin_IntersectionPoint.cpp
-    SketchPlugin_Circle.cpp
     SketchPlugin_Arc.cpp
+    SketchPlugin_Circle.cpp
     SketchPlugin_Constraint.cpp
+    SketchPlugin_ConstraintAngle.cpp
     SketchPlugin_ConstraintBase.cpp
     SketchPlugin_ConstraintCoincidence.cpp
     SketchPlugin_ConstraintCollinear.cpp
     SketchPlugin_ConstraintDistance.cpp
+    SketchPlugin_ConstraintDistanceAlongDir.cpp
+    SketchPlugin_ConstraintDistanceHorizontal.cpp
+    SketchPlugin_ConstraintDistanceVertical.cpp
+    SketchPlugin_ConstraintEqual.cpp
+    SketchPlugin_Fillet.cpp
+    SketchPlugin_ConstraintHorizontal.cpp
     SketchPlugin_ConstraintLength.cpp
     SketchPlugin_ConstraintMiddle.cpp
+    SketchPlugin_ConstraintMirror.cpp
     SketchPlugin_ConstraintParallel.cpp
     SketchPlugin_ConstraintPerpendicular.cpp
     SketchPlugin_ConstraintRadius.cpp
     SketchPlugin_ConstraintRigid.cpp
-    SketchPlugin_ConstraintHorizontal.cpp
-    SketchPlugin_ConstraintVertical.cpp
-    SketchPlugin_ConstraintEqual.cpp
     SketchPlugin_ConstraintTangent.cpp
-    SketchPlugin_ConstraintMirror.cpp
-    SketchPlugin_ConstraintFillet.cpp
-    SketchPlugin_ConstraintAngle.cpp
+    SketchPlugin_ConstraintVertical.cpp
+    SketchPlugin_Ellipse.cpp
+    SketchPlugin_ExternalValidator.cpp
+    SketchPlugin_Feature.cpp
+    SketchPlugin_IntersectionPoint.cpp
+    SketchPlugin_Line.cpp
+    SketchPlugin_MacroArc.cpp
+    SketchPlugin_MacroCircle.cpp
+    SketchPlugin_MacroEllipse.cpp
     SketchPlugin_MultiRotation.cpp
     SketchPlugin_MultiTranslation.cpp
-    SketchPlugin_ExternalValidator.cpp
-    SketchPlugin_Validators.cpp
-    SketchPlugin_Tools.cpp
+    SketchPlugin_Plugin.cpp
+    SketchPlugin_Point.cpp
     SketchPlugin_Projection.cpp
+    SketchPlugin_Sketch.cpp
+    SketchPlugin_SketchEntity.cpp
+    SketchPlugin_Split.cpp
+    SketchPlugin_Tools.cpp
+    SketchPlugin_Trim.cpp
+    SketchPlugin_Validators.cpp
 )
 
 SET(PROJECT_LIBRARIES
@@ -81,6 +118,7 @@ SET(PROJECT_LIBRARIES
     GeomAPI
     GeomAlgoAPI
     ModelAPI
+    ModelGeomAlgo
     SketcherPrs
     GeomDataAPI
 )
@@ -89,14 +127,21 @@ SET(XML_RESOURCES
   plugin-Sketch.xml
 )
 
+SET(TEXT_RESOURCES
+	SketchPlugin_msg_en.ts
+)
+
+SOURCE_GROUP ("Resource Files" FILES ${TEXT_RESOURCES})
+
 ADD_DEFINITIONS(-DSKETCHPLUGIN_EXPORTS)
-ADD_LIBRARY(SketchPlugin MODULE ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${XML_RESOURCES})
+ADD_LIBRARY(SketchPlugin MODULE ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${XML_RESOURCES} ${TEXT_RESOURCES})
 TARGET_LINK_LIBRARIES(SketchPlugin ${PROJECT_LIBRARIES})
 
 INCLUDE_DIRECTORIES(
   ../Config
   ../Events
   ../ModelAPI
+  ../ModelGeomAlgo
   ../GeomAPI
   ../GeomAlgoAPI
   ../GeomDataAPI
@@ -106,27 +151,88 @@ INCLUDE_DIRECTORIES(
 INSTALL(TARGETS SketchPlugin DESTINATION ${SHAPER_INSTALL_PLUGIN_FILES})
 INSTALL(FILES ${XML_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES})
 INSTALL(DIRECTORY icons/ DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}/icons/Sketch)
+INSTALL(FILES ${TEXT_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES})
 
 ADD_UNIT_TESTS(TestSketchPointLine.py
-               TestSketchArcCircle.py
-               TestConstraintConcidence.py
-               # TestConstraintCollinear.py
+               TestCreateArcByCenterStartEnd.py
+               TestCreateArcByThreePoints.py
+               TestCreateArcByTangentEdge.py
+               TestCreateArcChangeType.py
+               TestCreateCircleByCenterAndPassed.py
+               TestCreateCircleByThreePoints.py
+               TestCreateCircleChangeType.py
+               TestConstraintCoincidence.py
+               TestConstraintCollinear.py
                TestConstraintLength.py
                TestConstraintDistance.py
+               TestConstraintDistanceHorizontal.py
+               TestConstraintDistanceVertical.py
+               TestConstraintDistanceBehavior.py
                TestConstraintParallel.py
                TestConstraintPerpendicular.py
                TestConstraintRadius.py
-               TestConstraintRigid.py
+               TestConstraintFixed.py
                TestConstraintHorizontal.py
+               TestConstraintHorizontalValidator.py
                TestConstraintVertical.py
                TestConstraintEqual.py
                TestConstraintTangent.py
-               TestConstraintMirror.py
-               #TestConstraintAngle.py
+               TestConstraintAngle.py
                TestConstraintMiddlePoint.py
+               TestMirror.py
                TestMultiRotation.py
                TestMultiTranslation.py
                TestFillet.py
+               TestFilletInteracting.py
                TestRectangle.py
+               TestProjection.py
+               TestProjectionIntoResult.py
+               TestSplit.py
                TestHighload.py
-               TestSnowflake.py)
+               TestSnowflake.py
+               TestArcBehavior.py
+               TestRemoveSketch.py
+               Test1061.py
+               Test1673.py
+               Test1924.py
+               Test1966.py
+               Test1967.py
+               Test2095.py
+               Test2115.py
+               TestTrimArc01.py
+               TestTrimArc02.py
+               TestTrimArc03.py
+               TestTrimArc04.py
+               TestTrimArc05.py
+               TestTrimArc06.py
+               TestTrimArc07.py
+               TestTrimCircle01.py
+               TestTrimCircle02.py
+               TestTrimCircle03.py
+               TestTrimCircle04.py
+               TestTrimCircle05.py
+               TestTrimCircleAndArc01.py
+               TestTrimLine01.py
+               TestTrimLine02.py
+               Test2229.py
+               Test2239.py
+               TestDistanceSignedVsUnsigned01.py
+               TestDistanceSignedVsUnsigned02.py
+               TestDistanceSignedVsUnsigned03.py
+               TestDistanceSignedVsUnsigned04.py
+               TestDistanceSignedVsUnsigned05.py
+               TestSignedDistancePointPoint.py
+               TestSignedDistancePointLine.py
+               Test2273.py
+               Test2280.py
+)
+
+if(${SKETCHER_CHANGE_RADIUS_WHEN_MOVE})
+  ADD_UNIT_TESTS(
+               TestMovePoint.py
+               TestMoveLine.py
+               TestMoveCircle.py
+               TestMoveArc.py
+               TestMovementComplex.py
+  )
+endif()
\ No newline at end of file