X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchSolver%2FCMakeLists.txt;h=ac4117627f2fa573e001bc6f34558a5b52675edd;hb=ad6e991b0289e8dc50624c9d45bc35363644c81d;hp=2178882ab38bd4b4dde62176b40f446b2d63d084;hpb=beb7b62b44875845bc640e1d9ccde5ea15ee1a2a;p=modules%2Fshaper.git

diff --git a/src/SketchSolver/CMakeLists.txt b/src/SketchSolver/CMakeLists.txt
index 2178882ab..ac4117627 100644
--- a/src/SketchSolver/CMakeLists.txt
+++ b/src/SketchSolver/CMakeLists.txt
@@ -1,46 +1,111 @@
+## Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 INCLUDE(Common)
-INCLUDE(FindSolveSpace)
 
 SET(PROJECT_HEADERS
     SketchSolver.h
-    SketchSolver_Solver.h
+    SketchSolver_Error.h
     SketchSolver_Constraint.h
-    SketchSolver_ConstraintGroup.h
-    SketchSolver_ConstraintManager.h
+    SketchSolver_ConstraintAngle.h
+    SketchSolver_ConstraintCoincidence.h
+    SketchSolver_ConstraintCollinear.h
+    SketchSolver_ConstraintDistance.h
+    SketchSolver_ConstraintEqual.h
+    SketchSolver_ConstraintLength.h
+    SketchSolver_ConstraintMiddle.h
+    SketchSolver_ConstraintMirror.h
+    SketchSolver_ConstraintFixed.h
+    SketchSolver_ConstraintFixedArcRadius.h
+    SketchSolver_ConstraintTangent.h
+    SketchSolver_ConstraintMulti.h
+    SketchSolver_ConstraintMultiRotation.h
+    SketchSolver_ConstraintMultiTranslation.h
+    SketchSolver_ConstraintMovement.h
+    SketchSolver_Group.h
+    SketchSolver_Builder.h
+    SketchSolver_IConstraintWrapper.h
+    SketchSolver_IEntityWrapper.h
+    SketchSolver_IParameterWrapper.h
+    SketchSolver_ISolver.h
+    SketchSolver_Manager.h
+    SketchSolver_Storage.h
 )
 
 SET(PROJECT_SOURCES
-    SketchSolver_Solver.cpp
     SketchSolver_Constraint.cpp
-    SketchSolver_ConstraintGroup.cpp
-    SketchSolver_ConstraintManager.cpp
+    SketchSolver_ConstraintAngle.cpp
+    SketchSolver_ConstraintCoincidence.cpp
+    SketchSolver_ConstraintCollinear.cpp
+    SketchSolver_ConstraintDistance.cpp
+    SketchSolver_ConstraintEqual.cpp
+    SketchSolver_ConstraintLength.cpp
+    SketchSolver_ConstraintMiddle.cpp
+    SketchSolver_ConstraintMirror.cpp
+    SketchSolver_ConstraintFixed.cpp
+    SketchSolver_ConstraintFixedArcRadius.cpp
+    SketchSolver_ConstraintTangent.cpp
+    SketchSolver_ConstraintMulti.cpp
+    SketchSolver_ConstraintMultiRotation.cpp
+    SketchSolver_ConstraintMultiTranslation.cpp
+    SketchSolver_ConstraintMovement.cpp
+    SketchSolver_Group.cpp
+    SketchSolver_Builder.cpp
+    SketchSolver_Manager.cpp
+    SketchSolver_Storage.cpp
 )
 
 SET(PROJECT_LIBRARIES
-    ${SLVS_LIBRARIES}
+    Config
     Events
     ModelAPI
-    Model
+    GeomAPI
+    GeomDataAPI
 )
 
 INCLUDE_DIRECTORIES(
+    ${PROJECT_SOURCE_DIR}/src/Config
     ${PROJECT_SOURCE_DIR}/src/SketchPlugin
     ${PROJECT_SOURCE_DIR}/src/ModelAPI
-    ${PROJECT_SOURCE_DIR}/src/Model
     ${PROJECT_SOURCE_DIR}/src/GeomAPI
     ${PROJECT_SOURCE_DIR}/src/GeomDataAPI
     ${PROJECT_SOURCE_DIR}/src/Events
 )
 
-ADD_DEFINITIONS(-DSKETCHSOLVER_EXPORTS ${BOOST_DEFINITIONS})
+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}
+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()