X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchPlugin%2FCMakeLists.txt;h=0f54cd5e397a5a6be362c0eb08794652494718f1;hb=8476d5e088f7b1b5a414fa5e33ce99d6131929eb;hp=d1499da27b51e7d82a9b6a664318a475d1e4591d;hpb=301fde7eeae07fdae18ebd02f93e09d1a182e38d;p=modules%2Fshaper.git

diff --git a/src/SketchPlugin/CMakeLists.txt b/src/SketchPlugin/CMakeLists.txt
index d1499da27..0f54cd5e3 100644
--- a/src/SketchPlugin/CMakeLists.txt
+++ b/src/SketchPlugin/CMakeLists.txt
@@ -11,13 +11,16 @@ SET(PROJECT_HEADERS
     SketchPlugin_SketchEntity.h
     SketchPlugin_Line.h
     SketchPlugin_Point.h
+    SketchPlugin_IntersectionPoint.h
     SketchPlugin_Circle.h
     SketchPlugin_Arc.h
     SketchPlugin_Constraint.h
     SketchPlugin_ConstraintBase.h
     SketchPlugin_ConstraintCoincidence.h
+    SketchPlugin_ConstraintCollinear.h
     SketchPlugin_ConstraintDistance.h
     SketchPlugin_ConstraintLength.h
+    SketchPlugin_ConstraintMiddle.h
     SketchPlugin_ConstraintParallel.h
     SketchPlugin_ConstraintPerpendicular.h
     SketchPlugin_ConstraintRadius.h
@@ -26,9 +29,14 @@ SET(PROJECT_HEADERS
     SketchPlugin_ConstraintVertical.h
     SketchPlugin_ConstraintEqual.h
     SketchPlugin_ConstraintTangent.h
-    SketchPlugin_ShapeValidator.h
+    SketchPlugin_ConstraintMirror.h
+    SketchPlugin_ConstraintFillet.h
+    SketchPlugin_ConstraintAngle.h
+    SketchPlugin_MultiRotation.h
+    SketchPlugin_MultiTranslation.h
+    SketchPlugin_ExternalValidator.h
     SketchPlugin_Validators.h
-    SketchPlugin_ResultValidators.h 
+    SketchPlugin_Tools.h
 )
 
 SET(PROJECT_SOURCES
@@ -38,12 +46,16 @@ SET(PROJECT_SOURCES
     SketchPlugin_SketchEntity.cpp
     SketchPlugin_Line.cpp
     SketchPlugin_Point.cpp
+    SketchPlugin_IntersectionPoint.cpp
     SketchPlugin_Circle.cpp
     SketchPlugin_Arc.cpp
+    SketchPlugin_Constraint.cpp
     SketchPlugin_ConstraintBase.cpp
     SketchPlugin_ConstraintCoincidence.cpp
+    SketchPlugin_ConstraintCollinear.cpp
     SketchPlugin_ConstraintDistance.cpp
     SketchPlugin_ConstraintLength.cpp
+    SketchPlugin_ConstraintMiddle.cpp
     SketchPlugin_ConstraintParallel.cpp
     SketchPlugin_ConstraintPerpendicular.cpp
     SketchPlugin_ConstraintRadius.cpp
@@ -52,9 +64,14 @@ SET(PROJECT_SOURCES
     SketchPlugin_ConstraintVertical.cpp
     SketchPlugin_ConstraintEqual.cpp
     SketchPlugin_ConstraintTangent.cpp
-    SketchPlugin_ShapeValidator.cpp
+    SketchPlugin_ConstraintMirror.cpp
+    SketchPlugin_ConstraintFillet.cpp
+    SketchPlugin_ConstraintAngle.cpp
+    SketchPlugin_MultiRotation.cpp
+    SketchPlugin_MultiTranslation.cpp
+    SketchPlugin_ExternalValidator.cpp
     SketchPlugin_Validators.cpp
-    SketchPlugin_ResultValidators.cpp
+    SketchPlugin_Tools.cpp
 )
 
 SET(PROJECT_LIBRARIES
@@ -63,8 +80,7 @@ SET(PROJECT_LIBRARIES
     GeomAlgoAPI
     ModelAPI
     SketcherPrs
-    ${CAS_KERNEL}
-    ${CAS_SHAPE}
+    GeomDataAPI
 )
 
 SET(XML_RESOURCES
@@ -85,15 +101,16 @@ INCLUDE_DIRECTORIES(
   ../SketcherPrs
 )
 
-INSTALL(TARGETS SketchPlugin DESTINATION plugins)
-INSTALL(FILES ${XML_RESOURCES} DESTINATION plugins)
+INSTALL(TARGETS SketchPlugin DESTINATION ${SHAPER_INSTALL_PLUGIN_FILES})
+INSTALL(FILES ${XML_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES})
 
 ADD_UNIT_TESTS(TestSketchPointLine.py
                TestSketchArcCircle.py
                TestConstraintConcidence.py
+               TestConstraintCollinear.py
                TestConstraintLength.py
                TestConstraintDistance.py
-#               TestConstraintParallel.py
+               TestConstraintParallel.py
                TestConstraintPerpendicular.py
                TestConstraintRadius.py
                TestConstraintRigid.py
@@ -101,6 +118,12 @@ ADD_UNIT_TESTS(TestSketchPointLine.py
                TestConstraintVertical.py
                TestConstraintEqual.py
                TestConstraintTangent.py
-               TestConstraintParallel.py
+               TestConstraintMirror.py
+               TestConstraintAngle.py
+               TestConstraintMiddlePoint.py
+               TestMultiRotation.py
+               TestMultiTranslation.py
+               TestFillet.py
+               TestRectangle.py
                TestHighload.py
                TestSnowflake.py)