X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchPlugin%2FCMakeLists.txt;h=3e3924954c2e6fab50a4bb4492bc0f487f404b04;hb=3aa818c0a5abf4c46afa2d91cad46340efc4bd5f;hp=e2fc7682907a66d296778b08b05c3209a0a6fe29;hpb=eb0bc337423e37ed5bfbd9cbcb3c6ec183108c3b;p=modules%2Fshaper.git

diff --git a/src/SketchPlugin/CMakeLists.txt b/src/SketchPlugin/CMakeLists.txt
index e2fc76829..3e3924954 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,15 @@ 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
+    SketchPlugin_Projection.h
 )
 
 SET(PROJECT_SOURCES
@@ -38,12 +47,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 +65,15 @@ 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
+    SketchPlugin_Projection.cpp
 )
 
 SET(PROJECT_LIBRARIES
@@ -63,16 +82,21 @@ SET(PROJECT_LIBRARIES
     GeomAlgoAPI
     ModelAPI
     SketcherPrs
-    ${CAS_KERNEL}
-    ${CAS_SHAPE}
+    GeomDataAPI
 )
 
 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(
@@ -85,12 +109,15 @@ 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})
+INSTALL(DIRECTORY icons/ DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}/icons/Sketch)
+INSTALL(FILES ${TEXT_RESOURCES} DESTINATION ${SHAPER_INSTALL_PLUGIN_FILES})
 
 ADD_UNIT_TESTS(TestSketchPointLine.py
                TestSketchArcCircle.py
-               TestConstraintConcidence.py
+               TestConstraintCoincidence.py
+               # TestConstraintCollinear.py
                TestConstraintLength.py
                TestConstraintDistance.py
                TestConstraintParallel.py
@@ -101,5 +128,13 @@ ADD_UNIT_TESTS(TestSketchPointLine.py
                TestConstraintVertical.py
                TestConstraintEqual.py
                TestConstraintTangent.py
+               TestConstraintMirror.py
+               TestConstraintAngle.py
+               TestConstraintMiddlePoint.py
+               TestMultiRotation.py
+               TestMultiTranslation.py
+               TestFillet.py
+               TestRectangle.py
+               TestProjection.py
                TestHighload.py
                TestSnowflake.py)