X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchSolver%2FCMakeLists.txt;h=ac4117627f2fa573e001bc6f34558a5b52675edd;hb=8650972609ad538567a5b952c3890ba8613c8f9f;hp=5b5e1dda566ea089ee383e0e32a092f65e9031a3;hpb=1035bf933e269bb31c23aac191815f2a42f9ed0a;p=modules%2Fshaper.git

diff --git a/src/SketchSolver/CMakeLists.txt b/src/SketchSolver/CMakeLists.txt
index 5b5e1dda5..ac4117627 100644
--- a/src/SketchSolver/CMakeLists.txt
+++ b/src/SketchSolver/CMakeLists.txt
@@ -1,58 +1,65 @@
 ## Copyright (C) 2014-20xx CEA/DEN, EDF R&D
 
 INCLUDE(Common)
-INCLUDE(FindSolveSpace)
 
 SET(PROJECT_HEADERS
     SketchSolver.h
     SketchSolver_Error.h
-    SketchSolver_Solver.h
     SketchSolver_Constraint.h
+    SketchSolver_ConstraintAngle.h
     SketchSolver_ConstraintCoincidence.h
+    SketchSolver_ConstraintCollinear.h
     SketchSolver_ConstraintDistance.h
     SketchSolver_ConstraintEqual.h
-    SketchSolver_ConstraintFillet.h
     SketchSolver_ConstraintLength.h
+    SketchSolver_ConstraintMiddle.h
     SketchSolver_ConstraintMirror.h
-    SketchSolver_ConstraintRigid.h
+    SketchSolver_ConstraintFixed.h
+    SketchSolver_ConstraintFixedArcRadius.h
     SketchSolver_ConstraintTangent.h
+    SketchSolver_ConstraintMulti.h
     SketchSolver_ConstraintMultiRotation.h
     SketchSolver_ConstraintMultiTranslation.h
     SketchSolver_ConstraintMovement.h
-    SketchSolver_Builder.h
     SketchSolver_Group.h
-    SketchSolver_ConstraintManager.h
+    SketchSolver_Builder.h
+    SketchSolver_IConstraintWrapper.h
+    SketchSolver_IEntityWrapper.h
+    SketchSolver_IParameterWrapper.h
+    SketchSolver_ISolver.h
+    SketchSolver_Manager.h
     SketchSolver_Storage.h
-    SketchSolver_FeatureStorage.h
 )
 
 SET(PROJECT_SOURCES
-    SketchSolver_Solver.cpp
     SketchSolver_Constraint.cpp
+    SketchSolver_ConstraintAngle.cpp
     SketchSolver_ConstraintCoincidence.cpp
+    SketchSolver_ConstraintCollinear.cpp
     SketchSolver_ConstraintDistance.cpp
     SketchSolver_ConstraintEqual.cpp
-    SketchSolver_ConstraintFillet.cpp
     SketchSolver_ConstraintLength.cpp
+    SketchSolver_ConstraintMiddle.cpp
     SketchSolver_ConstraintMirror.cpp
-    SketchSolver_ConstraintRigid.cpp
+    SketchSolver_ConstraintFixed.cpp
+    SketchSolver_ConstraintFixedArcRadius.cpp
     SketchSolver_ConstraintTangent.cpp
+    SketchSolver_ConstraintMulti.cpp
     SketchSolver_ConstraintMultiRotation.cpp
     SketchSolver_ConstraintMultiTranslation.cpp
     SketchSolver_ConstraintMovement.cpp
-    SketchSolver_Builder.cpp
     SketchSolver_Group.cpp
-    SketchSolver_ConstraintManager.cpp
+    SketchSolver_Builder.cpp
+    SketchSolver_Manager.cpp
     SketchSolver_Storage.cpp
-    SketchSolver_FeatureStorage.cpp
 )
 
 SET(PROJECT_LIBRARIES
-    ${SLVS_LIBRARIES}
     Config
     Events
     ModelAPI
     GeomAPI
+    GeomDataAPI
 )
 
 INCLUDE_DIRECTORIES(
@@ -66,10 +73,39 @@ INCLUDE_DIRECTORIES(
 
 ADD_DEFINITIONS(-DSKETCHSOLVER_EXPORTS)
 
-ADD_LIBRARY(SketchSolver MODULE ${PROJECT_SOURCES} ${PROJECT_HEADERS}
+ADD_LIBRARY(SketchSolver SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS}
 )
 
 TARGET_LINK_LIBRARIES(SketchSolver ${PROJECT_LIBRARIES}
 )
 
-INSTALL(TARGETS SketchSolver DESTINATION plugins)
+INSTALL(TARGETS SketchSolver DESTINATION ${SHAPER_INSTALL_PLUGIN_FILES})
+
+
+# Include specific solvers
+IF(NO_SolveSpace)
+  SET(SSPath_FOUND FALSE)
+ELSE()
+  FIND_FILE(SSPath "SolveSpaceSolver/CMakeLists.txt" PATHS "${CMAKE_CURRENT_SOURCE_DIR}")
+  STRING(COMPARE NOTEQUAL ${SSPath} "SSPath-NOTFOUND" SSPath_FOUND)
+ENDIF()
+
+IF(NO_PlaneGCS)
+  SET(GCSPath_FOUND FALSE)
+ELSE()
+  FIND_FILE(GCSPath "PlaneGCSSolver/CMakeLists.txt" PATHS "${CMAKE_CURRENT_SOURCE_DIR}")
+  STRING(COMPARE NOTEQUAL ${GCSPath} "GCSPath-NOTFOUND" GCSPath_FOUND)
+ENDIF()
+
+IF(${SSPath_FOUND} OR ${GCSPath_FOUND})
+  IF(${SSPath_FOUND})
+    MESSAGE(STATUS "SolveSpaceSolver plugin found in ${SSPath}")
+    ADD_SUBDIRECTORY(SolveSpaceSolver)
+  ENDIF()
+  IF(${GCSPath_FOUND})
+    MESSAGE(STATUS "PlaneGCSSolver plugin found in ${GCSPath}")
+    ADD_SUBDIRECTORY(PlaneGCSSolver)
+  ENDIF()
+ELSE()
+  MESSAGE(WARNING "No sketch solver plugin is found")
+ENDIF()