Revert "First phase of SketchSolver refactoring"

[modules/shaper.git] / src / SketchSolver / CMakeLists.txt

diff --git a/src/SketchSolver/CMakeLists.txt b/src/SketchSolver/CMakeLists.txt
index 79094bf2fffddcfda68efc5bf9c9a5a508200431..126fb212e7c6cddf5886afbd8a885f0bf7fe2b93 100644 (file)
--- a/src/SketchSolver/CMakeLists.txt
+++ b/src/SketchSolver/CMakeLists.txt
@@ -1,56 +1,60 @@
 ## Copyright (C) 2014-20xx CEA/DEN, EDF R&D
 
 INCLUDE(Common)
+FIND_PACKAGE(SolveSpace REQUIRED)
 
 SET(PROJECT_HEADERS
     SketchSolver.h
     SketchSolver_Error.h
+    SketchSolver_Solver.h
     SketchSolver_Constraint.h
     SketchSolver_ConstraintAngle.h
     SketchSolver_ConstraintCoincidence.h
     SketchSolver_ConstraintDistance.h
     SketchSolver_ConstraintEqual.h
+    SketchSolver_ConstraintFillet.h
     SketchSolver_ConstraintLength.h
     SketchSolver_ConstraintMirror.h
-    SketchSolver_ConstraintFixed.h
+    SketchSolver_ConstraintRigid.h
     SketchSolver_ConstraintTangent.h
     SketchSolver_ConstraintMulti.h
     SketchSolver_ConstraintMultiRotation.h
     SketchSolver_ConstraintMultiTranslation.h
     SketchSolver_ConstraintMovement.h
-#    SketchSolver_ConstraintParametric.h
-    SketchSolver_Group.h
+    SketchSolver_ConstraintParametric.h
     SketchSolver_Builder.h
-    SketchSolver_IConstraintWrapper.h
-    SketchSolver_IEntityWrapper.h
-    SketchSolver_IParameterWrapper.h
-    SketchSolver_ISolver.h
-    SketchSolver_Manager.h
+    SketchSolver_Group.h
+    SketchSolver_ConstraintManager.h
     SketchSolver_Storage.h
+    SketchSolver_FeatureStorage.h
 )
 
 SET(PROJECT_SOURCES
+    SketchSolver_Solver.cpp
     SketchSolver_Constraint.cpp
     SketchSolver_ConstraintAngle.cpp
     SketchSolver_ConstraintCoincidence.cpp
     SketchSolver_ConstraintDistance.cpp
     SketchSolver_ConstraintEqual.cpp
+    SketchSolver_ConstraintFillet.cpp
     SketchSolver_ConstraintLength.cpp
     SketchSolver_ConstraintMirror.cpp
-    SketchSolver_ConstraintFixed.cpp
+    SketchSolver_ConstraintRigid.cpp
     SketchSolver_ConstraintTangent.cpp
     SketchSolver_ConstraintMulti.cpp
     SketchSolver_ConstraintMultiRotation.cpp
     SketchSolver_ConstraintMultiTranslation.cpp
+    SketchSolver_ConstraintParametric.cpp
     SketchSolver_ConstraintMovement.cpp
-#    SketchSolver_ConstraintParametric.cpp
-    SketchSolver_Group.cpp
     SketchSolver_Builder.cpp
-    SketchSolver_Manager.cpp
+    SketchSolver_Group.cpp
+    SketchSolver_ConstraintManager.cpp
     SketchSolver_Storage.cpp
+    SketchSolver_FeatureStorage.cpp
 )
 
 SET(PROJECT_LIBRARIES
+    ${SOLVESPACE_LIBRARIES}
     Config
     Events
     ModelAPI
@@ -58,6 +62,7 @@ SET(PROJECT_LIBRARIES
 )
 
 INCLUDE_DIRECTORIES(
+    ${SOLVESPACE_INCLUDE_DIRS}
     ${PROJECT_SOURCE_DIR}/src/Config
     ${PROJECT_SOURCE_DIR}/src/SketchPlugin
     ${PROJECT_SOURCE_DIR}/src/ModelAPI
@@ -68,30 +73,10 @@ INCLUDE_DIRECTORIES(
 
 ADD_DEFINITIONS(-DSKETCHSOLVER_EXPORTS)
 
-ADD_LIBRARY(SketchSolver SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS}
+ADD_LIBRARY(SketchSolver MODULE ${PROJECT_SOURCES} ${PROJECT_HEADERS}
 )
 
 TARGET_LINK_LIBRARIES(SketchSolver ${PROJECT_LIBRARIES}
 )
 
 INSTALL(TARGETS SketchSolver DESTINATION plugins)
-
-
-# Include specific solvers
-FIND_FILE(SSPath "SolveSpaceSolver/CMakeLists.txt" PATHS "${CMAKE_CURRENT_SOURCE_DIR}")
-STRING(COMPARE NOTEQUAL ${SSPath} "SSPath-NOTFOUND" SSPath_FOUND)
-FIND_FILE(GCSPath "PlainGCSSolver/CMakeLists.txt" PATHS "${CMAKE_CURRENT_SOURCE_DIR}")
-STRING(COMPARE NOTEQUAL ${GCSPath} "GCSPath-NOTFOUND" GCSPath_FOUND)
-
-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 "PlainGCSSolver plugin found in ${GCSPath}")
-    ADD_SUBDIRECTORY(PlainGCSSolver)
-  ENDIF()
-ELSE()
-  MESSAGE(WARNING "No sketch solver plugin is found")
-ENDIF()