X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchSolver%2FCMakeLists.txt;h=126fb212e7c6cddf5886afbd8a885f0bf7fe2b93;hb=8da5ddb2feeb29c481a51530a435be524bf720e9;hp=8964c31f8c012b4a22a45141a3a98ef22ff7a18f;hpb=142e6a7451245b1c39e5d0afbabb5dc4f678520e;p=modules%2Fshaper.git

diff --git a/src/SketchSolver/CMakeLists.txt b/src/SketchSolver/CMakeLists.txt
index 8964c31f8..126fb212e 100644
--- a/src/SketchSolver/CMakeLists.txt
+++ b/src/SketchSolver/CMakeLists.txt
@@ -1,28 +1,69 @@
+## Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 INCLUDE(Common)
-INCLUDE(FindSolveSpace)
+FIND_PACKAGE(SolveSpace REQUIRED)
 
 SET(PROJECT_HEADERS
     SketchSolver.h
+    SketchSolver_Error.h
     SketchSolver_Solver.h
     SketchSolver_Constraint.h
-    SketchSolver_ConstraintGroup.h
+    SketchSolver_ConstraintAngle.h
+    SketchSolver_ConstraintCoincidence.h
+    SketchSolver_ConstraintDistance.h
+    SketchSolver_ConstraintEqual.h
+    SketchSolver_ConstraintFillet.h
+    SketchSolver_ConstraintLength.h
+    SketchSolver_ConstraintMirror.h
+    SketchSolver_ConstraintRigid.h
+    SketchSolver_ConstraintTangent.h
+    SketchSolver_ConstraintMulti.h
+    SketchSolver_ConstraintMultiRotation.h
+    SketchSolver_ConstraintMultiTranslation.h
+    SketchSolver_ConstraintMovement.h
+    SketchSolver_ConstraintParametric.h
+    SketchSolver_Builder.h
+    SketchSolver_Group.h
     SketchSolver_ConstraintManager.h
+    SketchSolver_Storage.h
+    SketchSolver_FeatureStorage.h
 )
 
 SET(PROJECT_SOURCES
     SketchSolver_Solver.cpp
     SketchSolver_Constraint.cpp
-    SketchSolver_ConstraintGroup.cpp
+    SketchSolver_ConstraintAngle.cpp
+    SketchSolver_ConstraintCoincidence.cpp
+    SketchSolver_ConstraintDistance.cpp
+    SketchSolver_ConstraintEqual.cpp
+    SketchSolver_ConstraintFillet.cpp
+    SketchSolver_ConstraintLength.cpp
+    SketchSolver_ConstraintMirror.cpp
+    SketchSolver_ConstraintRigid.cpp
+    SketchSolver_ConstraintTangent.cpp
+    SketchSolver_ConstraintMulti.cpp
+    SketchSolver_ConstraintMultiRotation.cpp
+    SketchSolver_ConstraintMultiTranslation.cpp
+    SketchSolver_ConstraintParametric.cpp
+    SketchSolver_ConstraintMovement.cpp
+    SketchSolver_Builder.cpp
+    SketchSolver_Group.cpp
     SketchSolver_ConstraintManager.cpp
+    SketchSolver_Storage.cpp
+    SketchSolver_FeatureStorage.cpp
 )
 
 SET(PROJECT_LIBRARIES
-    ${SLVS_LIBRARIES}
+    ${SOLVESPACE_LIBRARIES}
+    Config
     Events
     ModelAPI
+    GeomAPI
 )
 
 INCLUDE_DIRECTORIES(
+    ${SOLVESPACE_INCLUDE_DIRS}
+    ${PROJECT_SOURCE_DIR}/src/Config
     ${PROJECT_SOURCE_DIR}/src/SketchPlugin
     ${PROJECT_SOURCE_DIR}/src/ModelAPI
     ${PROJECT_SOURCE_DIR}/src/GeomAPI
@@ -30,15 +71,12 @@ INCLUDE_DIRECTORIES(
     ${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 MODULE ${PROJECT_SOURCES} ${PROJECT_HEADERS}
 )
 
-TARGET_LINK_LIBRARIES(SketchSolver
-    ${PROJECT_LIBRARIES}
+TARGET_LINK_LIBRARIES(SketchSolver ${PROJECT_LIBRARIES}
 )
 
 INSTALL(TARGETS SketchSolver DESTINATION plugins)